modified: output.js.map

project/src/canvas/game/output.js

@@ -44395,8 +44395,13 @@ 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");
+<<<<<<< HEAD
 var XxlScene_1 = __webpack_require__(/*! ../xiaoxiaole/XxlScene */ "./src/xiaoxiaole/XxlScene.ts");
 var StartScene_1 = __webpack_require__(/*! ../chuansongdai/StartScene */ "./src/chuansongdai/StartScene.ts");
+=======
+var StartScene_1 = __webpack_require__(/*! ../xiaoxiaole/StartScene */ "./src/xiaoxiaole/StartScene.ts");
+var StartScene_2 = __webpack_require__(/*! ../chuansongdai/StartScene */ "./src/chuansongdai/StartScene.ts");
+>>>>>>> 532aafc2f9f32b5bff0b65872fe9fdece75f6a0f
 var LoadingScene = (function (_super) {
     __extends(LoadingScene, _super);
     function LoadingScene() {
@@ -44450,13 +44455,21 @@ 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) {
+<<<<<<< HEAD
                 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.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.XxlScene); });
+>>>>>>> 532aafc2f9f32b5bff0b65872fe9fdece75f6a0f
             }
         });
         FYGE.GDispatcher.addEventListener("loadEnd", function () {
             that.isEnd = true;
             if (that.tweenEnd) {
+<<<<<<< HEAD
                 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); });
+=======
+                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_2.CsdScene); });
+>>>>>>> 532aafc2f9f32b5bff0b65872fe9fdece75f6a0f
             }
         }, that);
     };
@@ -44848,61 +44861,10 @@ 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 ***!
-  \************************************/
+/***/ "./src/xiaoxiaole/StartScene.ts":
+/*!**************************************!*\
+  !*** ./src/xiaoxiaole/StartScene.ts ***!
+  \**************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -44926,7 +44888,7 @@ 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 SelectCatPanel_1 = __webpack_require__(/*! ../panels/selectcatpanel/SelectCatPanel */ "./src/panels/selectcatpanel/SelectCatPanel.ts");
 var XxlScene = (function (_super) {
     __extends(XxlScene, _super);
     function XxlScene() {
@@ -44938,7 +44900,7 @@ var XxlScene = (function (_super) {
         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);
+        ctrls_1.showPanel(SelectCatPanel_1.SelectCatPanel);
     };
     XxlScene.prototype.start = function () {
         this.initUi();

project/src/canvas/game/released/output.js

@@ -44397,8 +44397,13 @@ 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");
+<<<<<<< HEAD
 var XxlScene_1 = __webpack_require__(/*! ../xiaoxiaole/XxlScene */ "./src/xiaoxiaole/XxlScene.ts");
 var StartScene_1 = __webpack_require__(/*! ../chuansongdai/StartScene */ "./src/chuansongdai/StartScene.ts");
+=======
+var StartScene_1 = __webpack_require__(/*! ../xiaoxiaole/StartScene */ "./src/xiaoxiaole/StartScene.ts");
+var StartScene_2 = __webpack_require__(/*! ../chuansongdai/StartScene */ "./src/chuansongdai/StartScene.ts");
+>>>>>>> 532aafc2f9f32b5bff0b65872fe9fdece75f6a0f
 var LoadingScene = (function (_super) {
     __extends(LoadingScene, _super);
     function LoadingScene() {
@@ -44452,13 +44457,21 @@ 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) {
+<<<<<<< HEAD
                 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.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.XxlScene); });
+>>>>>>> 532aafc2f9f32b5bff0b65872fe9fdece75f6a0f
             }
         });
         FYGE.GDispatcher.addEventListener("loadEnd", function () {
             that.isEnd = true;
             if (that.tweenEnd) {
+<<<<<<< HEAD
                 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); });
+=======
+                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_2.CsdScene); });
+>>>>>>> 532aafc2f9f32b5bff0b65872fe9fdece75f6a0f
             }
         }, that);
     };
@@ -44850,6 +44863,7 @@ exports.MainSceneBtnUi = MainSceneBtnUi;
 
 /***/ }),
 
+<<<<<<< HEAD
 /***/ "./src/xiaoxiaole/MainScene.ts":
 /*!*************************************!*\
   !*** ./src/xiaoxiaole/MainScene.ts ***!
@@ -44905,6 +44919,12 @@ exports.MainScene = MainScene;
 /*!************************************!*\
   !*** ./src/xiaoxiaole/XxlScene.ts ***!
   \************************************/
+=======
+/***/ "./src/xiaoxiaole/StartScene.ts":
+/*!**************************************!*\
+  !*** ./src/xiaoxiaole/StartScene.ts ***!
+  \**************************************/
+>>>>>>> 532aafc2f9f32b5bff0b65872fe9fdece75f6a0f
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -44928,7 +44948,11 @@ 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");
+<<<<<<< HEAD
 var MainScene_1 = __webpack_require__(/*! ./MainScene */ "./src/xiaoxiaole/MainScene.ts");
+=======
+var SelectCatPanel_1 = __webpack_require__(/*! ../panels/selectcatpanel/SelectCatPanel */ "./src/panels/selectcatpanel/SelectCatPanel.ts");
+>>>>>>> 532aafc2f9f32b5bff0b65872fe9fdece75f6a0f
 var XxlScene = (function (_super) {
     __extends(XxlScene, _super);
     function XxlScene() {
@@ -44940,7 +44964,11 @@ var XxlScene = (function (_super) {
         this.addChild(sceneBg);
         this.x = (Ins_1.Ins.stageW - 750) >> 1;
         this.y = (Ins_1.Ins.stageH - 1624) >> 1;
+<<<<<<< HEAD
         ctrls_1.changeScene(MainScene_1.MainScene);
+=======
+        ctrls_1.showPanel(SelectCatPanel_1.SelectCatPanel);
+>>>>>>> 532aafc2f9f32b5bff0b65872fe9fdece75f6a0f
     };
     XxlScene.prototype.start = function () {
         this.initUi();

project/src/canvas/game/src/scenes/StartScene.ts

@@ -16,7 +16,6 @@ export class StartScene extends Scene {
     this.y = (Ins.stageH - 1624)>>1;
 
     // showPanel(SelectCatPanel);
-    changeScene(MainScene)
     // this.addChild(new MainScene());
 
   }