Skip to content

N
new_taobao
Commit d13da819 authored by spc's avatar spc
Browse files
Options

modified: src/scenes/LoadingScene.ts

parent 27528222
Show whitespace changes
Inline Side-by-side
Showing with 549 additions and 224 deletions
project/src/canvas/game/output.js
View file @ d13da819
......@@ -2561,6 +2561,57 @@ var Cat = (function (_super) {
exports.Cat = Cat;
/***/ }),
/***/ "./src/chuansongdai/StartScene.ts":
/*!****************************************!*\
!*** ./src/chuansongdai/StartScene.ts ***!
\****************************************/
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
var __extends = (this && this.__extends) || (function () {
var extendStatics = function (d, b) {
extendStatics = Object.setPrototypeOf ||
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
return extendStatics(d, b);
};
return function (d, b) {
extendStatics(d, b);
function __() { this.constructor = d; }
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
})();
Object.defineProperty(exports, "__esModule", { value: true });
exports.CsdScene = void 0;
var Scene_1 = __webpack_require__(/*! ../../module/views/Scene */ "./module/views/Scene.ts");
var Ins_1 = __webpack_require__(/*! ../Ins */ "./src/Ins.ts");
var ctrls_1 = __webpack_require__(/*! ../../module/ctrls */ "./module/ctrls/index.ts");
var SelectCatPanel_1 = __webpack_require__(/*! ../panels/selectcatpanel/SelectCatPanel */ "./src/panels/selectcatpanel/SelectCatPanel.ts");
var CsdScene = (function (_super) {
__extends(CsdScene, _super);
function CsdScene() {
return _super !== null && _super.apply(this, arguments) || this;
}
CsdScene.prototype.initUi = function () {
_super.prototype.initUi.call(this);
var sceneBg = Ins_1.Ins.initSprite("b3c8c187-e5c9-4968-9a00-a118d18ab2fc");
this.addChild(sceneBg);
this.x = (Ins_1.Ins.stageW - 750) >> 1;
this.y = (Ins_1.Ins.stageH - 1624) >> 1;
ctrls_1.showPanel(SelectCatPanel_1.SelectCatPanel);
};
CsdScene.prototype.start = function () {
this.initUi();
};
return CsdScene;
}(Scene_1.Scene));
exports.CsdScene = CsdScene;
/***/ }),
/***/ "./src/common/G_EVENT.ts":
......@@ -44344,7 +44395,8 @@ var Scene_1 = __webpack_require__(/*! ../../module/views/Scene */ "./module/view
var Ins_1 = __webpack_require__(/*! ../Ins */ "./src/Ins.ts");
var resloadingList_1 = __webpack_require__(/*! ../../../game/resloadingList */ "./resloadingList.js");
var ctrls_1 = __webpack_require__(/*! ../../module/ctrls */ "./module/ctrls/index.ts");
var StartScene_1 = __webpack_require__(/*! ./StartScene */ "./src/scenes/StartScene.ts");
var XxlScene_1 = __webpack_require__(/*! ../xiaoxiaole/XxlScene */ "./src/xiaoxiaole/XxlScene.ts");
var StartScene_1 = __webpack_require__(/*! ../chuansongdai/StartScene */ "./src/chuansongdai/StartScene.ts");
var LoadingScene = (function (_super) {
__extends(LoadingScene, _super);
function LoadingScene() {
......@@ -44398,13 +44450,13 @@ var LoadingScene = (function (_super) {
FYGE.Tween.get(this.loading, { onChange: function () { that.zhuazi.x = (that.loading.x + that.loading.width - 30); }, onChangeObj: that }).to({ x: -80 }, 200).call(function () {
that.tweenEnd = true;
if (that.isEnd) {
FYGE.Tween.get(that.loading, { onChange: function () { that.zhuazi.x = (that.loading.x + that.loading.width - 30); }, onChangeObj: that }).to({ x: 9 }, 600).call(function () { ctrls_1.changeScene(StartScene_1.StartScene); });
FYGE.Tween.get(that.loading, { onChange: function () { that.zhuazi.x = (that.loading.x + that.loading.width - 30); }, onChangeObj: that }).to({ x: 9 }, 600).call(function () { ctrls_1.changeScene(XxlScene_1.XxlScene); });
}
});
FYGE.GDispatcher.addEventListener("loadEnd", function () {
that.isEnd = true;
if (that.tweenEnd) {
FYGE.Tween.get(that.loading, { onChange: function () { that.zhuazi.x = (that.loading.x + that.loading.width - 30); }, onChangeObj: that }).to({ x: 9 }, 600).call(function () { ctrls_1.changeScene(StartScene_1.StartScene); });
FYGE.Tween.get(that.loading, { onChange: function () { that.zhuazi.x = (that.loading.x + that.loading.width - 30); }, onChangeObj: that }).to({ x: 9 }, 600).call(function () { ctrls_1.changeScene(StartScene_1.CsdScene); });
}
}, that);
};
......@@ -44552,57 +44604,6 @@ var MainScene = (function (_super) {
exports.MainScene = MainScene;
/***/ }),
/***/ "./src/scenes/StartScene.ts":
/*!**********************************!*\
!*** ./src/scenes/StartScene.ts ***!
\**********************************/
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
var __extends = (this && this.__extends) || (function () {
var extendStatics = function (d, b) {
extendStatics = Object.setPrototypeOf ||
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
return extendStatics(d, b);
};
return function (d, b) {
extendStatics(d, b);
function __() { this.constructor = d; }
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
})();
Object.defineProperty(exports, "__esModule", { value: true });
exports.StartScene = void 0;
var Scene_1 = __webpack_require__(/*! ../../module/views/Scene */ "./module/views/Scene.ts");
var Ins_1 = __webpack_require__(/*! ../Ins */ "./src/Ins.ts");
var ctrls_1 = __webpack_require__(/*! ../../module/ctrls */ "./module/ctrls/index.ts");
var SelectCatPanel_1 = __webpack_require__(/*! ../panels/selectcatpanel/SelectCatPanel */ "./src/panels/selectcatpanel/SelectCatPanel.ts");
var StartScene = (function (_super) {
__extends(StartScene, _super);
function StartScene() {
return _super !== null && _super.apply(this, arguments) || this;
}
StartScene.prototype.initUi = function () {
_super.prototype.initUi.call(this);
var sceneBg = Ins_1.Ins.initSprite("b3c8c187-e5c9-4968-9a00-a118d18ab2fc");
this.addChild(sceneBg);
this.x = (Ins_1.Ins.stageW - 750) >> 1;
this.y = (Ins_1.Ins.stageH - 1624) >> 1;
ctrls_1.showPanel(SelectCatPanel_1.SelectCatPanel);
};
StartScene.prototype.start = function () {
this.initUi();
};
return StartScene;
}(Scene_1.Scene));
exports.StartScene = StartScene;
/***/ }),
/***/ "./src/scenes/stage.ts":
......@@ -44845,6 +44846,108 @@ var MainSceneBtnUi = (function (_super) {
exports.MainSceneBtnUi = MainSceneBtnUi;
/***/ }),
/***/ "./src/xiaoxiaole/MainScene.ts":
/*!*************************************!*\
!*** ./src/xiaoxiaole/MainScene.ts ***!
\*************************************/
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
var __extends = (this && this.__extends) || (function () {
var extendStatics = function (d, b) {
extendStatics = Object.setPrototypeOf ||
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
return extendStatics(d, b);
};
return function (d, b) {
extendStatics(d, b);
function __() { this.constructor = d; }
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
})();
Object.defineProperty(exports, "__esModule", { value: true });
exports.MainScene = void 0;
var Scene_1 = __webpack_require__(/*! ../../module/views/Scene */ "./module/views/Scene.ts");
var MainScene = (function (_super) {
__extends(MainScene, _super);
function MainScene() {
return _super !== null && _super.apply(this, arguments) || this;
}
MainScene.prototype.initUi = function () {
var that = this;
that.initSceneEle();
};
MainScene.prototype.initSceneEle = function () {
};
MainScene.prototype.initEvents = function () {
var that = this;
console.log("主场景添加事件");
};
MainScene.prototype.removeEvents = function () {
var that = this;
console.log("主场景移除事件");
};
return MainScene;
}(Scene_1.Scene));
exports.MainScene = MainScene;
/***/ }),
/***/ "./src/xiaoxiaole/XxlScene.ts":
/*!************************************!*\
!*** ./src/xiaoxiaole/XxlScene.ts ***!
\************************************/
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
var __extends = (this && this.__extends) || (function () {
var extendStatics = function (d, b) {
extendStatics = Object.setPrototypeOf ||
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
return extendStatics(d, b);
};
return function (d, b) {
extendStatics(d, b);
function __() { this.constructor = d; }
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
})();
Object.defineProperty(exports, "__esModule", { value: true });
exports.XxlScene = void 0;
var Scene_1 = __webpack_require__(/*! ../../module/views/Scene */ "./module/views/Scene.ts");
var Ins_1 = __webpack_require__(/*! ../Ins */ "./src/Ins.ts");
var ctrls_1 = __webpack_require__(/*! ../../module/ctrls */ "./module/ctrls/index.ts");
var MainScene_1 = __webpack_require__(/*! ./MainScene */ "./src/xiaoxiaole/MainScene.ts");
var XxlScene = (function (_super) {
__extends(XxlScene, _super);
function XxlScene() {
return _super !== null && _super.apply(this, arguments) || this;
}
XxlScene.prototype.initUi = function () {
_super.prototype.initUi.call(this);
var sceneBg = Ins_1.Ins.initSprite("b3c8c187-e5c9-4968-9a00-a118d18ab2fc");
this.addChild(sceneBg);
this.x = (Ins_1.Ins.stageW - 750) >> 1;
this.y = (Ins_1.Ins.stageH - 1624) >> 1;
ctrls_1.changeScene(MainScene_1.MainScene);
};
XxlScene.prototype.start = function () {
this.initUi();
};
return XxlScene;
}(Scene_1.Scene));
exports.XxlScene = XxlScene;
/***/ })
/******/ });
project/src/canvas/game/output.js.map
View file @ d13da819
This source diff could not be displayed because it is too large. You can view the blob instead.
project/src/canvas/game/released/output.js
View file @ d13da819
......@@ -2563,6 +2563,57 @@ var Cat = (function (_super) {
exports.Cat = Cat;
/***/ }),
/***/ "./src/chuansongdai/StartScene.ts":
/*!****************************************!*\
!*** ./src/chuansongdai/StartScene.ts ***!
\****************************************/
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
var __extends = (this && this.__extends) || (function () {
var extendStatics = function (d, b) {
extendStatics = Object.setPrototypeOf ||
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
return extendStatics(d, b);
};
return function (d, b) {
extendStatics(d, b);
function __() { this.constructor = d; }
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
})();
Object.defineProperty(exports, "__esModule", { value: true });
exports.CsdScene = void 0;
var Scene_1 = __webpack_require__(/*! ../../module/views/Scene */ "./module/views/Scene.ts");
var Ins_1 = __webpack_require__(/*! ../Ins */ "./src/Ins.ts");
var ctrls_1 = __webpack_require__(/*! ../../module/ctrls */ "./module/ctrls/index.ts");
var SelectCatPanel_1 = __webpack_require__(/*! ../panels/selectcatpanel/SelectCatPanel */ "./src/panels/selectcatpanel/SelectCatPanel.ts");
var CsdScene = (function (_super) {
__extends(CsdScene, _super);
function CsdScene() {
return _super !== null && _super.apply(this, arguments) || this;
}
CsdScene.prototype.initUi = function () {
_super.prototype.initUi.call(this);
var sceneBg = Ins_1.Ins.initSprite("b3c8c187-e5c9-4968-9a00-a118d18ab2fc");
this.addChild(sceneBg);
this.x = (Ins_1.Ins.stageW - 750) >> 1;
this.y = (Ins_1.Ins.stageH - 1624) >> 1;
ctrls_1.showPanel(SelectCatPanel_1.SelectCatPanel);
};
CsdScene.prototype.start = function () {
this.initUi();
};
return CsdScene;
}(Scene_1.Scene));
exports.CsdScene = CsdScene;
/***/ }),
/***/ "./src/common/G_EVENT.ts":
......@@ -44346,7 +44397,8 @@ var Scene_1 = __webpack_require__(/*! ../../module/views/Scene */ "./module/view
var Ins_1 = __webpack_require__(/*! ../Ins */ "./src/Ins.ts");
var resloadingList_1 = __webpack_require__(/*! ../../../game/resloadingList */ "./resloadingList.js");
var ctrls_1 = __webpack_require__(/*! ../../module/ctrls */ "./module/ctrls/index.ts");
var StartScene_1 = __webpack_require__(/*! ./StartScene */ "./src/scenes/StartScene.ts");
var XxlScene_1 = __webpack_require__(/*! ../xiaoxiaole/XxlScene */ "./src/xiaoxiaole/XxlScene.ts");
var StartScene_1 = __webpack_require__(/*! ../chuansongdai/StartScene */ "./src/chuansongdai/StartScene.ts");
var LoadingScene = (function (_super) {
__extends(LoadingScene, _super);
function LoadingScene() {
......@@ -44400,13 +44452,13 @@ var LoadingScene = (function (_super) {
FYGE.Tween.get(this.loading, { onChange: function () { that.zhuazi.x = (that.loading.x + that.loading.width - 30); }, onChangeObj: that }).to({ x: -80 }, 200).call(function () {
that.tweenEnd = true;
if (that.isEnd) {
FYGE.Tween.get(that.loading, { onChange: function () { that.zhuazi.x = (that.loading.x + that.loading.width - 30); }, onChangeObj: that }).to({ x: 9 }, 600).call(function () { ctrls_1.changeScene(StartScene_1.StartScene); });
FYGE.Tween.get(that.loading, { onChange: function () { that.zhuazi.x = (that.loading.x + that.loading.width - 30); }, onChangeObj: that }).to({ x: 9 }, 600).call(function () { ctrls_1.changeScene(XxlScene_1.XxlScene); });
}
});
FYGE.GDispatcher.addEventListener("loadEnd", function () {
that.isEnd = true;
if (that.tweenEnd) {
FYGE.Tween.get(that.loading, { onChange: function () { that.zhuazi.x = (that.loading.x + that.loading.width - 30); }, onChangeObj: that }).to({ x: 9 }, 600).call(function () { ctrls_1.changeScene(StartScene_1.StartScene); });
FYGE.Tween.get(that.loading, { onChange: function () { that.zhuazi.x = (that.loading.x + that.loading.width - 30); }, onChangeObj: that }).to({ x: 9 }, 600).call(function () { ctrls_1.changeScene(StartScene_1.CsdScene); });
}
}, that);
};
......@@ -44554,57 +44606,6 @@ var MainScene = (function (_super) {
exports.MainScene = MainScene;
/***/ }),
/***/ "./src/scenes/StartScene.ts":
/*!**********************************!*\
!*** ./src/scenes/StartScene.ts ***!
\**********************************/
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
var __extends = (this && this.__extends) || (function () {
var extendStatics = function (d, b) {
extendStatics = Object.setPrototypeOf ||
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
return extendStatics(d, b);
};
return function (d, b) {
extendStatics(d, b);
function __() { this.constructor = d; }
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
})();
Object.defineProperty(exports, "__esModule", { value: true });
exports.StartScene = void 0;
var Scene_1 = __webpack_require__(/*! ../../module/views/Scene */ "./module/views/Scene.ts");
var Ins_1 = __webpack_require__(/*! ../Ins */ "./src/Ins.ts");
var ctrls_1 = __webpack_require__(/*! ../../module/ctrls */ "./module/ctrls/index.ts");
var SelectCatPanel_1 = __webpack_require__(/*! ../panels/selectcatpanel/SelectCatPanel */ "./src/panels/selectcatpanel/SelectCatPanel.ts");
var StartScene = (function (_super) {
__extends(StartScene, _super);
function StartScene() {
return _super !== null && _super.apply(this, arguments) || this;
}
StartScene.prototype.initUi = function () {
_super.prototype.initUi.call(this);
var sceneBg = Ins_1.Ins.initSprite("b3c8c187-e5c9-4968-9a00-a118d18ab2fc");
this.addChild(sceneBg);
this.x = (Ins_1.Ins.stageW - 750) >> 1;
this.y = (Ins_1.Ins.stageH - 1624) >> 1;
ctrls_1.showPanel(SelectCatPanel_1.SelectCatPanel);
};
StartScene.prototype.start = function () {
this.initUi();
};
return StartScene;
}(Scene_1.Scene));
exports.StartScene = StartScene;
/***/ }),
/***/ "./src/scenes/stage.ts":
......@@ -44847,6 +44848,108 @@ var MainSceneBtnUi = (function (_super) {
exports.MainSceneBtnUi = MainSceneBtnUi;
/***/ }),
/***/ "./src/xiaoxiaole/MainScene.ts":
/*!*************************************!*\
!*** ./src/xiaoxiaole/MainScene.ts ***!
\*************************************/
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
var __extends = (this && this.__extends) || (function () {
var extendStatics = function (d, b) {
extendStatics = Object.setPrototypeOf ||
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
return extendStatics(d, b);
};
return function (d, b) {
extendStatics(d, b);
function __() { this.constructor = d; }
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
})();
Object.defineProperty(exports, "__esModule", { value: true });
exports.MainScene = void 0;
var Scene_1 = __webpack_require__(/*! ../../module/views/Scene */ "./module/views/Scene.ts");
var MainScene = (function (_super) {
__extends(MainScene, _super);
function MainScene() {
return _super !== null && _super.apply(this, arguments) || this;
}
MainScene.prototype.initUi = function () {
var that = this;
that.initSceneEle();
};
MainScene.prototype.initSceneEle = function () {
};
MainScene.prototype.initEvents = function () {
var that = this;
console.log("主场景添加事件");
};
MainScene.prototype.removeEvents = function () {
var that = this;
console.log("主场景移除事件");
};
return MainScene;
}(Scene_1.Scene));
exports.MainScene = MainScene;
/***/ }),
/***/ "./src/xiaoxiaole/XxlScene.ts":
/*!************************************!*\
!*** ./src/xiaoxiaole/XxlScene.ts ***!
\************************************/
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
var __extends = (this && this.__extends) || (function () {
var extendStatics = function (d, b) {
extendStatics = Object.setPrototypeOf ||
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
return extendStatics(d, b);
};
return function (d, b) {
extendStatics(d, b);
function __() { this.constructor = d; }
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
})();
Object.defineProperty(exports, "__esModule", { value: true });
exports.XxlScene = void 0;
var Scene_1 = __webpack_require__(/*! ../../module/views/Scene */ "./module/views/Scene.ts");
var Ins_1 = __webpack_require__(/*! ../Ins */ "./src/Ins.ts");
var ctrls_1 = __webpack_require__(/*! ../../module/ctrls */ "./module/ctrls/index.ts");
var MainScene_1 = __webpack_require__(/*! ./MainScene */ "./src/xiaoxiaole/MainScene.ts");
var XxlScene = (function (_super) {
__extends(XxlScene, _super);
function XxlScene() {
return _super !== null && _super.apply(this, arguments) || this;
}
XxlScene.prototype.initUi = function () {
_super.prototype.initUi.call(this);
var sceneBg = Ins_1.Ins.initSprite("b3c8c187-e5c9-4968-9a00-a118d18ab2fc");
this.addChild(sceneBg);
this.x = (Ins_1.Ins.stageW - 750) >> 1;
this.y = (Ins_1.Ins.stageH - 1624) >> 1;
ctrls_1.changeScene(MainScene_1.MainScene);
};
XxlScene.prototype.start = function () {
this.initUi();
};
return XxlScene;
}(Scene_1.Scene));
exports.XxlScene = XxlScene;
/***/ })
/******/ });
project/src/canvas/game/released/resource/res.json
View file @ d13da819
......@@ -5,8 +5,8 @@
"name": "common",
"atlas": {
"comCloseBtn.png": {
"x": 646,
"y": 60,
"x": 2,
"y": 374,
"w": 48,
"h": 48,
"ox": 0,
......@@ -16,7 +16,7 @@
"ro": false
},
"toastBg.png": {
"x": 184,
"x": 2,
"y": 2,
"w": 460,
"h": 130,
......@@ -28,18 +28,18 @@
},
"waitingBg.png": {
"x": 2,
"y": 2,
"y": 134,
"w": 160,
"h": 180,
"ox": 0,
"oy": 0,
"sw": 160,
"sh": 180,
"ro": true
"ro": false
},
"waitingRot.png": {
"x": 646,
"y": 2,
"x": 2,
"y": 316,
"w": 56,
"h": 56,
"ox": 0,
......
project/src/canvas/game/resCanvasList.js
View file @ d13da819
......@@ -628,6 +628,38 @@ const resCanvasList = {
ext: '.jpg',
url: 'https://yun.duiba.com.cn/spark/assets/寝室1.e9238ec5e71c328817026128dd0f41fdc65203f4.jpg',
uuid: 'b3c8c187-e5c9-4968-9a00-a118d18ab2fc'
},
"分割xian": {},
"dasdasdasdasd": {},
'2a747211-0210-4215-86a2-a6955b37c45b': {
name: '白色',
ext: '.png',
url: 'https://yun.duiba.com.cn/spark-dev/assets/白色.41dae4fd01f4750aea58f694b40d97a9da8f23ca.png',
uuid: '2a747211-0210-4215-86a2-a6955b37c45b'
},
'7fcd3fb3-57bd-436a-afca-989b68b6b311': {
name: '背景',
ext: '.png',
url: 'https://yun.duiba.com.cn/spark-dev/assets/背景.9713f3181595c655058adc1f1fd039ee5e1911bf.png',
uuid: '7fcd3fb3-57bd-436a-afca-989b68b6b311'
},
'7d1ec658-9371-4d52-b4d7-e75d04037daf': {
name: '粉色',
ext: '.png',
url: 'https://yun.duiba.com.cn/spark-dev/assets/粉色.f5d6e3215bdb1048b015fba9d743ae03be13ee3f.png',
uuid: '7d1ec658-9371-4d52-b4d7-e75d04037daf'
},
'6a1345f6-969c-4969-8bfb-f4de637df34d': {
name: '黄色',
ext: '.png',
url: 'https://yun.duiba.com.cn/spark-dev/assets/黄色.3e05aa9a7e01b9083ec21eb0545179a1c9ca24fd.png',
uuid: '6a1345f6-969c-4969-8bfb-f4de637df34d'
},
'2e12a9ec-46be-487f-a9cd-550dd0af3746': {
name: '银色',
ext: '.png',
url: 'https://yun.duiba.com.cn/spark-dev/assets/银色.1735303df8f858d3d9f30d662c5fb03ae72fc4c6.png',
uuid: '2e12a9ec-46be-487f-a9cd-550dd0af3746'
}
};
export default resCanvasList;
\ No newline at end of file
project/src/canvas/game/resLottieList.js
View file @ d13da819
......@@ -4,21 +4,21 @@ const OrengeCatTexture = require("./src/lottieSrc/lottieTextureJson/OrengeCatTex
const SanhuaCatTexture = require("./src/lottieSrc/lottieTextureJson/SanhuaCatTexture.json")
const XianluoCatTexture = require("./src/lottieSrc/lottieTextureJson/XianluoCatTexture.json")
const resLottieList = {
"blueCat":{
imgUrl:resCanvasList["a7dc39fa-5f6d-4e94-8979-81c4a4aa183f"].url,
json:BlueCatTexture
},
"orengeCat":{
imgUrl:resCanvasList["72987d74-2fa7-49b9-865d-a0d80c6ed220"].url,
json:OrengeCatTexture
},
"sanhuaCat":{
imgUrl:resCanvasList["75320997-b466-4161-abab-b03a51ec522b"].url,
json:SanhuaCatTexture
},
"xianluoCat":{
imgUrl:resCanvasList["de2d1dca-ed1c-4fe0-93ef-684f4b96c87e"].url,
json:XianluoCatTexture
}
// "blueCat":{
// imgUrl:resCanvasList["a7dc39fa-5f6d-4e94-8979-81c4a4aa183f"].url,
// json:BlueCatTexture
// },
// "orengeCat":{
// imgUrl:resCanvasList["72987d74-2fa7-49b9-865d-a0d80c6ed220"].url,
// json:OrengeCatTexture
// },
// "sanhuaCat":{
// imgUrl:resCanvasList["75320997-b466-4161-abab-b03a51ec522b"].url,
// json:SanhuaCatTexture
// },
// "xianluoCat":{
// imgUrl:resCanvasList["de2d1dca-ed1c-4fe0-93ef-684f4b96c87e"].url,
// json:XianluoCatTexture
// }
}
export default resLottieList;
\ No newline at end of file
project/src/canvas/game/src/Main.ts
View file @ d13da819
......@@ -3,7 +3,6 @@ import { layers, destroyLayers } from "../module/views/layers";
import { ResJson } from "./ResJson";
import { G_EVENT } from "./common/G_EVENT";
import { destroyAllCtrls, changeScene, hideWaiting } from "../module/ctrls";
import { StartScene } from "./scenes/StartScene";
import { destroyNetData, sendTbNet, TbNetName } from "./TaoBaoNet";
......@@ -14,6 +13,7 @@ import { setStage } from "./scenes/stage";
import { LoadingScene } from "./scenes/LoadingScene";
import { Ins } from "./Ins";
import { InitLottie } from "./initLottie";
import { XxlScene } from "./xiaoxiaole/XxlScene";
/**
......@@ -86,7 +86,7 @@ export class Main {
console.log("舞台宽高：",Ins.stageW,Ins.stageH)
await RES.loadSparkAssets(resloadingList);
console.log('resloadingList 加载完毕')
changeScene(LoadingScene);
changeScene(XxlScene);
await RES.loadSparkAssets(resCanvasList).catch(()=>{
console.log('loadSparkAssets resCanvasList 失败')
});
......
project/src/canvas/game/src/ResJson.ts
View file @ d13da819
......@@ -5,8 +5,8 @@ export const ResJson = {
"name": "common",
"atlas": {
"comCloseBtn.png": {
"x": 646,
"y": 60,
"x": 2,
"y": 374,
"w": 48,
"h": 48,
"ox": 0,
......@@ -16,7 +16,7 @@ export const ResJson = {
"ro": false
},
"toastBg.png": {
"x": 184,
"x": 2,
"y": 2,
"w": 460,
"h": 130,
......@@ -28,18 +28,18 @@ export const ResJson = {
},
"waitingBg.png": {
"x": 2,
"y": 2,
"y": 134,
"w": 160,
"h": 180,
"ox": 0,
"oy": 0,
"sw": 160,
"sh": 180,
"ro": true
"ro": false
},
"waitingRot.png": {
"x": 646,
"y": 2,
"x": 2,
"y": 316,
"w": 56,
"h": 56,
"ox": 0,
......@@ -55,5 +55,5 @@ export const ResJson = {
"name": "startScene"
}
],
"path": "https://yun.duiba.com.cn/db_games/activity/babycare_xiaoxiao/1600243346/resource/"
"path": "https://yun.duiba.com.cn/db_games/activity/babycare_xiaoxiao/1600827862/resource/"
}
\ No newline at end of file
project/src/canvas/game/src/scenes/LoadingScene.ts
View file @ d13da819
......@@ -3,87 +3,89 @@ import { Scene } from "../../module/views/Scene";
import { Ins } from "../Ins";
import resloadingList from "../../../game/resloadingList";
import { changeScene } from "../../module/ctrls";
import { StartScene } from "./StartScene";
import { XxlScene } from "../xiaoxiaole/StartScene";
import { XxlScene } from "../xiaoxiaole/XxlScene";
import { CsdScene } from "../chuansongdai/StartScene";
export class LoadingScene extends Scene{
export class LoadingScene extends Scene {
private bg:FYGE.Sprite;
private cat:FYGE.Sprite;
private dialogBox:FYGE.Sprite;
private loadingGroup:FYGE.Sprite;
private loadingBg:FYGE.Sprite;
private loading:FYGE.Sprite;
private zhuazi:FYGE.Sprite;
private notice:FYGE.TextField;
private loadingMask:FYGE.Shape;
private bg: FYGE.Sprite;
private cat: FYGE.Sprite;
private dialogBox: FYGE.Sprite;
private loadingGroup: FYGE.Sprite;
private loadingBg: FYGE.Sprite;
private loading: FYGE.Sprite;
private zhuazi: FYGE.Sprite;
private notice: FYGE.TextField;
private loadingMask: FYGE.Shape;
private isEnd = false;
private tweenEnd = false;
initUi(){
var that = this;
that.x = (Ins.stageW - 750)>>1;
that.y = (Ins.stageH - 1624)>>1;
initUi() {
// var that = this;
// that.x = (Ins.stageW - 750) >> 1;
// that.y = (Ins.stageH - 1624) >> 1;
that.bg = new FYGE.Sprite(RES.getRes(resloadingList["42084cc4-390d-4eee-8392-fbbe2e59455e"].url));
that.addChild(that.bg);
// that.bg = new FYGE.Sprite(RES.getRes(resloadingList["42084cc4-390d-4eee-8392-fbbe2e59455e"].url));
// that.addChild(that.bg);
that.cat = new FYGE.Sprite(RES.getRes(resloadingList["4e3c6e09-0593-4818-976a-d73fe588580b"].url));
that.addChild(that.cat);
that.cat.x = 91;
that.cat.y = 792;
// that.cat = new FYGE.Sprite(RES.getRes(resloadingList["4e3c6e09-0593-4818-976a-d73fe588580b"].url));
// that.addChild(that.cat);
// that.cat.x = 91;
// that.cat.y = 792;
that.dialogBox = new FYGE.Sprite(RES.getRes(resloadingList["1857a043-27d7-4925-9535-acb70ae3e90e"].url));
that.dialogBox.x = 268;
that.dialogBox.y = 695;
that.addChild(that.dialogBox);
// that.dialogBox = new FYGE.Sprite(RES.getRes(resloadingList["1857a043-27d7-4925-9535-acb70ae3e90e"].url));
// that.dialogBox.x = 268;
// that.dialogBox.y = 695;
// that.addChild(that.dialogBox);
that.notice = new FYGE.TextField();
that.notice.fillColor = "black";
that.notice.size = 28;
that.notice.x = 150;
that.notice.y = 1134;
that.notice.text = "猫咪精力条恢复满后就不再恢复了哦~";
that.addChild(that.notice);
// that.notice = new FYGE.TextField();
// that.notice.fillColor = "black";
// that.notice.size = 28;
// that.notice.x = 150;
// that.notice.y = 1134;
// that.notice.text = "猫咪精力条恢复满后就不再恢复了哦~";
// that.addChild(that.notice);
that.loadingGroup = new FYGE.Sprite(RES.getRes(resloadingList["bd699d4f-af43-463f-b2ba-43e2803228a1"].url));
that.loadingGroup.x = 65;
that.loadingGroup.y = 1043;
that.addChild(that.loadingGroup);
// that.loadingGroup = new FYGE.Sprite(RES.getRes(resloadingList["bd699d4f-af43-463f-b2ba-43e2803228a1"].url));
// that.loadingGroup.x = 65;
// that.loadingGroup.y = 1043;
// that.addChild(that.loadingGroup);
that.loading = new FYGE.Sprite(RES.getRes(resloadingList["efc21755-0441-41d5-b56f-d177026342d4"].url));
that.loading.x = 9;
that.loading.y = 9;
that.loading.anchorY = that.loading.height>>1;
that.loading.x = -that.loading.width;
that.loadingGroup.addChild(that.loading);
// that.loading = new FYGE.Sprite(RES.getRes(resloadingList["efc21755-0441-41d5-b56f-d177026342d4"].url));
// that.loading.x = 9;
// that.loading.y = 9;
// that.loading.anchorY = that.loading.height >> 1;
// that.loading.x = -that.loading.width;
// that.loadingGroup.addChild(that.loading);
that.loadingMask = new FYGE.Shape();
that.loadingMask.x = 9;
that.loadingMask.y = 9;
that.loadingGroup.addChild(that.loadingMask);
that.loadingMask.beginFill(6,1);
that.loadingMask.drawRoundedRect(0,0,that.loading.width,that.loading.height,38,38,38,38);
that.loadingMask.endFill();
that.loading.mask = that.loadingMask;
// that.loadingMask = new FYGE.Shape();
// that.loadingMask.x = 9;
// that.loadingMask.y = 9;
// that.loadingGroup.addChild(that.loadingMask);
// that.loadingMask.beginFill(6, 1);
// that.loadingMask.drawRoundedRect(0, 0, that.loading.width, that.loading.height, 38, 38, 38, 38);
// that.loadingMask.endFill();
// that.loading.mask = that.loadingMask;
that.zhuazi = new FYGE.Sprite(RES.getRes(resloadingList["d01a19e5-fa4f-40b9-a6dc-9d21e0cc756e"].url));
that.loadingGroup.addChild(that.zhuazi);
that.zhuazi.y = -5;
// that.zhuazi = new FYGE.Sprite(RES.getRes(resloadingList["d01a19e5-fa4f-40b9-a6dc-9d21e0cc756e"].url));
// that.loadingGroup.addChild(that.zhuazi);
// that.zhuazi.y = -5;
FYGE.Tween.get(this.loading,{onChange:()=>{that.zhuazi.x = (that.loading.x+that.loading.width-30)},onChangeObj:that}).to({x:-80},200).call(()=>{
that.tweenEnd = true;
if(that.isEnd){
FYGE.Tween.get(that.loading,{onChange:()=>{that.zhuazi.x = (that.loading.x+that.loading.width-30)},onChangeObj:that}).to({x:9},600).call(()=>{changeScene(XxlScene)});
}
})
// FYGE.Tween.get(this.loading, { onChange: () => { that.zhuazi.x = (that.loading.x + that.loading.width - 30) }, onChangeObj: that }).to({ x: -80 }, 200).call(() => {
// that.tweenEnd = true;
// if (that.isEnd) {
FYGE.GDispatcher.addEventListener("loadEnd",()=>{
that.isEnd = true;
if(that.tweenEnd){
FYGE.Tween.get(that.loading,{onChange:()=>{that.zhuazi.x = (that.loading.x+that.loading.width-30)},onChangeObj:that}).to({x:9},600).call(()=>{changeScene(CsdScene)});
}
},that)
// // changeScene(XxlScene)
// // FYGE.Tween.get(that.loading,{onChange:()=>{that.zhuazi.x = (that.loading.x+that.loading.width-30)},onChangeObj:that}).to({x:9},600).call(()=>{changeScene(XxlScene)});
// }
// })
// FYGE.GDispatcher.addEventListener("loadEnd", () => {
// that.isEnd = true;
// if (that.tweenEnd) {
// changeScene(XxlScene)
// // FYGE.Tween.get(that.loading,{onChange:()=>{that.zhuazi.x = (that.loading.x+that.loading.width-30)},onChangeObj:that}).to({x:9},600).call(()=>{changeScene(XxlScene)});
// }
// }, that)
}
}
\ No newline at end of file
project/src/canvas/game/src/scenes/StartScene.ts
View file @ d13da819
......@@ -3,9 +3,9 @@ import { RES } from "../../module/RES";
import Root from "./Root";
// import res from "../../test/output.json"
import resCanvasList from "../../../game/resCanvasList"
import { MainScene } from "./MainScene";
import { MainScene } from "../xiaoxiaole/MainScene";
import { Ins } from "../Ins";
import { showPanel } from "../../module/ctrls";
import { changeScene, showPanel } from "../../module/ctrls";
import { SelectCatPanel } from "../panels/selectcatpanel/SelectCatPanel";
export class StartScene extends Scene {
initUi() {
......@@ -15,12 +15,11 @@ export class StartScene extends Scene {
this.x = (Ins.stageW - 750)>>1;
this.y = (Ins.stageH - 1624)>>1;
showPanel(SelectCatPanel);
// showPanel(SelectCatPanel);
changeScene(MainScene)
// this.addChild(new MainScene());
}
start() {
this.initUi()
}
}
project/src/canvas/game/src/xiaoxiaole/MainScene.ts 0 → 100644
View file @ d13da819
import { Scene } from "../../module/views/Scene";
import resCanvasList from "../../resCanvasList";
import { RES } from "../../module/RES";
import { Ins } from "../Ins";
import { MainSceneBtnUi } from "../ui/mainSceneBtnUi";
import { MSG, SCENETYPE } from "../Enum";
import { showToast } from "../../module/ctrls";
import { GDispatcher } from "../Main";
import { Cat } from "../cat/Cat";
import { Tools } from "../Tools";
export class MainScene extends Scene {
bg: FYGE.Sprite
initUi() {
var that = this;
that.initSceneEle();
this.bg = Ins.initSprite("7fcd3fb3-57bd-436a-afca-989b68b6b311")
that.addChild(this.bg)
this.setHexagram(7)
}
// 初始化六角形4/7/10/13/16....
setHexagram(max: number) {
let c = Math.ceil(max / 2)
let x = (2 * max + 1) / 3
let str = ""
for (let i = 0; i < 2 * max - x; i++) {
if (i < max - x) {
for (let j = 0; j <= i; j++) {
str += `${j}`
}
str += '\n'
} else if (i >= max - x && i <= c) {
console.log(i, max - i - 2 + x)
for (let j = max - i - 2 + x; j > 0; j--) {
str += `${j}`
}
str += '\n'
} else if (i > c && i < max) {
for (let j = 0; j < i + 1; j++) {
str += `${j}`
}
str += '\n'
} else {
for (let j = max - i - 2 + x; j > 0; j--) {
str += `${j}`
}
str += '\n'
}
}
console.log(str)
}
/**初始化场景元素 */
initSceneEle() {
console.log(1111)
}
initEvents() {
var that = this;
console.log("主场景添加事件")
// that.tlBtn.addEventListener(FYGE.MouseEvent.CLICK,()=>{that.changeMainScene(SCENETYPE.CLASSROOM)},that);
// that.mxqBtn.addEventListener(FYGE.MouseEvent.CLICK,()=>{that.changeMainScene(SCENETYPE.PLAYGROUND)},that);
// FYGE.GDispatcher.addEventListener(MSG.CHANGE_SCENE,()=>{that.changeMainScene(SCENETYPE.BEADROOM)},that);
}
removeEvents() {
var that = this;
console.log("主场景移除事件")
// that.tlBtn.removeEventListener(FYGE.MouseEvent.CLICK,()=>{that.changeMainScene(SCENETYPE.CLASSROOM)},that);
// that.mxqBtn.removeEventListener(FYGE.MouseEvent.CLICK,()=>{that.changeMainScene(SCENETYPE.PLAYGROUND)},that);
// FYGE.GDispatcher.removeEventListener(MSG.CHANGE_SCENE,()=>{that.changeMainScene(SCENETYPE.BEADROOM)},that);
}
}
\ No newline at end of file
project/src/canvas/game/src/xiaoxiaole/StartScene.ts → project/src/canvas/game/src/xiaoxiaole/XxlScene.ts
View file @ d13da819
import { Scene } from "../../module/views/Scene";
import { RES } from "../../module/RES";
// import res from "../../test/output.json"
import resCanvasList from "../../../game/resCanvasList"
import resCanvasList from "../../resCanvasList"
import { Ins } from "../Ins";
import { showPanel } from "../../module/ctrls";
import { changeScene, showPanel } from "../../module/ctrls";
import { SelectCatPanel } from "../panels/selectcatpanel/SelectCatPanel";
import { MainScene } from "./MainScene";
export class XxlScene extends Scene {
initUi() {
super.initUi();
var sceneBg = Ins.initSprite("b3c8c187-e5c9-4968-9a00-a118d18ab2fc");
this.addChild(sceneBg);
this.x = (Ins.stageW - 750)>>1;
this.y = (Ins.stageH - 1624)>>1;
this.x = (Ins.stageW - 750) >> 1;
this.y = (Ins.stageH - 1624) >> 1;
showPanel(SelectCatPanel);
// showPanel(SelectCatPanel);
// this.addChild(new MainScene());
}
changeScene(MainScene);
start() {
this.initUi()
}
}
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