m

.idea/workspace.xml

@@ -3,7 +3,9 @@
   <component name="ChangeListManager">
     <list default="true" id="0d3cb18d-e144-41a0-bc8b-4877c2e1fef1" name="默认的" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/scene/map/MapScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapScene.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/output.js" beforeDir="false" afterPath="$PROJECT_DIR$/output.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/output.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/output.js.map" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Tools.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/Tools.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -83,16 +85,6 @@
       <envs />
       <method v="2" />
     </configuration>
-    <configuration name="copyJs" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
-      <package-json value="$PROJECT_DIR$/package.json" />
-      <command value="run" />
-      <scripts>
-        <script value="copyJs" />
-      </scripts>
-      <node-interpreter value="project" />
-      <envs />
-      <method v="2" />
-    </configuration>
     <configuration name="dev" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
       <package-json value="$PROJECT_DIR$/package.json" />
       <command value="run" />
@@ -113,13 +105,18 @@
       <envs />
       <method v="2" />
     </configuration>
-    <recent_temporary>
     <list>
+      <item itemvalue="npm.build" />
+      <item itemvalue="npm.buildTS" />
       <item itemvalue="npm.dev" />
+      <item itemvalue="npm.flushRes" />
+    </list>
+    <recent_temporary>
+      <list>
         <item itemvalue="npm.buildTS" />
+        <item itemvalue="npm.dev" />
         <item itemvalue="npm.build" />
         <item itemvalue="npm.flushRes" />
-        <item itemvalue="npm.copyJs" />
       </list>
     </recent_temporary>
   </component>
@@ -135,7 +132,7 @@
       <workItem from="1612577003915" duration="21094000" />
       <workItem from="1612662929222" duration="40609000" />
       <workItem from="1613698993022" duration="22309000" />
-      <workItem from="1613785579125" duration="2317000" />
+      <workItem from="1613785579125" duration="3215000" />
     </task>
     <task id="LOCAL-00001" summary="斐乐消消乐">
       <created>1612581213298</created>
@@ -326,7 +323,14 @@
       <option name="project" value="LOCAL" />
       <updated>1613787841903</updated>
     </task>
-    <option name="localTasksCounter" value="28" />
+    <task id="LOCAL-00028" summary="m">
+      <created>1613787910985</created>
+      <option name="number" value="00028" />
+      <option name="presentableId" value="LOCAL-00028" />
+      <option name="project" value="LOCAL" />
+      <updated>1613787910985</updated>
+    </task>
+    <option name="localTasksCounter" value="29" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

output.js

@@ -7834,6 +7834,7 @@ var TbNetName;
 (function (TbNetName) {
     TbNetName["addStats"] = "feile.addStats";
     TbNetName["receiveEnamePrize"] = "feile.receiveEnamePrize";
+    TbNetName["getRemainTimes"] = "feile.getRemainTimes";
     TbNetName["getActivityBaseInfoById"] = "feile.getActivityBaseInfoById";
     TbNetName["getToolsInfo"] = "feile.getToolsInfo";
     TbNetName["consumerTools"] = "feile.consumerTools";
@@ -8071,6 +8072,20 @@ var Tools = (function () {
             });
         });
     };
+    Tools.updatePower = function () {
+        var _this = this;
+        return new Promise(function (resolve, reject) {
+            TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.getRemainTimes, {}, function (s, res) {
+                if (s) {
+                    _this.gameData.power = res.data.reaminTimes;
+                    resolve(true);
+                }
+                else {
+                    resolve(false);
+                }
+            });
+        });
+    };
     Tools.gameOver = function (data) {
         if (data.level == Tools.maxLevel) {
             ctrls_1.showPanel(SuccessNoPrizePanel_1.SuccessNoPrizePanel, data);
@@ -15242,6 +15257,7 @@ var Container = FYGE.Container;
 var Graphics = FYGE.Graphics;
 var Tween = FYGE.Tween;
 var Ease = FYGE.Ease;
+var Main_1 = __webpack_require__(/*! ../../Main */ "./src/Main.ts");
 var MapScene = (function (_super) {
     __extends(MapScene, _super);
     function MapScene() {
@@ -15400,9 +15416,15 @@ var MapScene = (function (_super) {
     MapScene.prototype.updateScene = function () {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
                         _super.prototype.updateScene.call(this);
+                        return [4, Tools_1.Tools.updatePower()];
+                    case 1:
+                        _a.sent();
                         this.uiLayer.updateUI();
                         return [2];
+                }
             });
         });
     };
@@ -15411,9 +15433,11 @@ var MapScene = (function (_super) {
     };
     MapScene.prototype.initEvents = function () {
         _super.prototype.initEvents.call(this);
+        Main_1.GDispatcher.addEventListener('UpdateScene', this.updateScene, this);
     };
     MapScene.prototype.removeEvents = function () {
         _super.prototype.removeEvents.call(this);
+        Main_1.GDispatcher.removeEventListener('UpdateScene', this.updateScene, this);
     };
     MapScene.checkArr = [];
     return MapScene;
@@ -24189,6 +24213,8 @@ var Element = (function (_super) {
         _this.states = [];
         _this.moveCount = 0;
         _this.moveDir = 1;
+        _this.moveDis = 1;
+        _this.moveMaxDis = 4;
         _this.moveFrame = 0;
         _this.moveFrameSign = 6;
         _this._type = type;
@@ -24291,15 +24317,11 @@ var Element = (function (_super) {
             this.moveFrame++;
             if (this.moveFrame > this.moveFrameSign) {
                 this.moveFrame = 0;
-                this.moveCount += this.moveDir;
-            }
-            if (this._effectType == EffectType_1.EffectType.HORIZONTAL) {
-                this.x += this.moveDir / this.moveFrameSign;
-            }
-            else if (this._effectType == EffectType_1.EffectType.VERTICAL) {
-                this.y += this.moveDir / this.moveFrameSign;
+                this.moveCount += this.moveDir * this.moveDis;
             }
-            if (Math.abs(this.moveCount) >= 3) {
+            var xy = (this._effectType == EffectType_1.EffectType.HORIZONTAL) ? "x" : "y";
+            this[xy] += this.moveDir * this.moveDis / this.moveFrameSign;
+            if (Math.abs(this.moveCount) >= this.moveMaxDis) {
                 this.moveDir *= -1;
             }
         }

src/Tools.ts

@@ -130,7 +130,7 @@ export class Tools {
             sendTbNet(TbNetName.getRemainTimes, {}, (s, res) => {
                 if (s) {
                     //修改体力数量
-                    this.gameData.power = res.data.reaminTimes;
+                    this.gameData.power = res.data.power;
                     resolve(true);
                 } else {
                     resolve(false);