modified: src/canvas/game/output.js

project/src/canvas/game/output.js

@@ -44396,12 +44396,17 @@ 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
+<<<<<<< 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 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() {
@@ -44455,8 +44460,12 @@ 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
 <<<<<<< 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.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
@@ -44465,8 +44474,12 @@ var LoadingScene = (function (_super) {
         FYGE.GDispatcher.addEventListener("loadEnd", function () {
             that.isEnd = true;
             if (that.tweenEnd) {
+<<<<<<< HEAD
 <<<<<<< 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
 =======
                 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