m

.idea/workspace.xml

@@ -3,11 +3,11 @@
   <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$/mock/miniTb/aa.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/aa.json" 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/panels/HelpPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/HelpPanel.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/panels/LotteryPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/LotteryPanel.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/panels/SuccessPrizePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/SuccessPrizePanel.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Tools.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/Tools.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/scene/map/MapUI.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapUI.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -136,14 +136,7 @@
       <workItem from="1613698993022" duration="22309000" />
       <workItem from="1613785579125" duration="17751000" />
       <workItem from="1613958457445" duration="19850000" />
-      <workItem from="1614131869846" duration="2614000" />
-    </task>
-    <task id="LOCAL-00006" summary="NoEnergyPanel">
-      <created>1612601677844</created>
-      <option name="number" value="00006" />
-      <option name="presentableId" value="LOCAL-00006" />
-      <option name="project" value="LOCAL" />
-      <updated>1612601677845</updated>
+      <workItem from="1614131869846" duration="4308000" />
     </task>
     <task id="LOCAL-00007" summary="NoStep">
       <created>1612602696160</created>
@@ -481,7 +474,14 @@
       <option name="project" value="LOCAL" />
       <updated>1614133895122</updated>
     </task>
-    <option name="localTasksCounter" value="55" />
+    <task id="LOCAL-00055" summary="m">
+      <created>1614135665220</created>
+      <option name="number" value="00055" />
+      <option name="presentableId" value="LOCAL-00055" />
+      <option name="project" value="LOCAL" />
+      <updated>1614135665220</updated>
+    </task>
+    <option name="localTasksCounter" value="56" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

mock/miniTb/aa.json

@@ -3,35 +3,41 @@
   "data": {
     "records": [
       {
-        "score": 35280,
+        "score": 40150,
         "level": 1,
         "isVisitSuccess": true,
         "stars": 3
+      },
+      {
+        "score": 96840,
+        "level": 99,
+        "isVisitSuccess": true,
+        "stars": 3
       }
     ],
     "openId": "AAHr9QYsANUEO_cbBdzJUj7O",
-    "rule": "扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩后端是多扩扩",
-    "topLevelVisitSuccess": false,
-    "updateTime": 1614047423516,
-    "title": "斐乐测试测试活动",
+    "rule": "扩扩扩扩扩扩后端是多扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩后端是多扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩后端是多扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩后端是多扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩后端是多扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩后端是多扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩后端是多扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩扩",
+    "topLevelVisitSuccess": true,
+    "updateTime": 1614136276849,
+    "title": "斐乐测试",
     "tools": {
-      "booms": 1,
-      "hammers": 1,
-      "steps": 1
+      "booms": 99,
+      "hammers": 111,
+      "steps": 111
     },
     "levelPrize": {
       "level50": "https://img.alicdn.com/imgextra/i2/676606897/O1CN017elfUH20osKEsgRdY_!!676606897-0-miniprogram.jpg",
       "level99": "https://img.alicdn.com/imgextra/i1/676606897/O1CN01kJeK0w20osKKCIz8a_!!676606897-0-miniprogram.jpg"
     },
-    "currentLevel": 2,
-    "createTime": 1614047375527,
-    "isDrawTopLevelPrize": false,
+    "currentLevel": 99,
+    "createTime": 1614047372717,
+    "isDrawTopLevelPrize": true,
     "deleteStatus": 1,
-    "awardReceiveExpiredTime": 1615257022000,
-    "startTime": 1614047422000,
-    "power": 1,
-    "_id": "6034688fe5c0d7b04c985429",
-    "endTime": 1614652222000,
+    "awardReceiveExpiredTime": 1617155583000,
+    "startTime": 1614131952569,
+    "power": 6,
+    "_id": "6034688c3075d92efd920adc",
+    "endTime": 1616550783000,
     "openPrizeStatus": 1,
     "tasks": {
       "invites": {

output.js

@@ -11318,12 +11318,13 @@ var HelpPanel = (function (_super) {
         _super.prototype.hidePanel.call(this);
         Tools_1.Tools.globalData.inviteId = '';
     };
-    HelpPanel.prototype.doHelp = function () {
+    HelpPanel.prototype.doHelp = function (e) {
         return __awaiter(this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        this.btnDelay(e.target);
                         if (Tools_1.Tools.globalData.inviteId == Tools_1.Tools.globalData.openId) {
                             ctrls_1.showToast('自己不能给自己助力');
                             this.hidePanel();
@@ -11486,7 +11487,7 @@ var LotteryPanel = (function (_super) {
         var _a = this.prizeData, type = _a.type, _id = _a._id;
         switch (type) {
             case 1:
-                TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.receiveEnamePrize, { _id: _id }, function (success, res) {
+                TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.receiveEnamePrize, { _id: _id, id: _id }, function (success, res) {
                     if (!success || !res) {
                         ctrls_1.showToast('奖品发放失败\n请前往我的奖品处进行处理');
                         _this.hidePanel();
@@ -12498,7 +12499,7 @@ var SuccessPrizePanel = (function (_super) {
         var _a = this.data.prize, name = _a.name, _id = _a._id, image = _a.image, type = _a.type, toolType = _a.toolType;
         switch (this.data.prize.type) {
             case 1:
-                TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.receiveEnamePrize, { _id: _id }, function (success, res) {
+                TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.receiveEnamePrize, { _id: _id, id: _id }, function (success, res) {
                     if (!success || !res) {
                         ctrls_1.showToast('奖品发放失败\n请前往我的奖品处进行处理');
                         _this.hidePanel();

src/Tools.ts

@@ -71,6 +71,8 @@ export class Tools {
         tasks: any,
     };// 活动基本信息
 
+    static actEnd = false;
+
     /**
      * 进入地图页面刷新
      */
@@ -79,12 +81,28 @@ export class Tools {
             sendTbNet(TbNetName.getActivityBaseInfoById, {}, (s, res) => {
                 if (s) {
                     this.gameData = res.data;
-                    sendTbNet(TbNetName.updateActivityInfo, {data: JSON.parse(JSON.stringify(res.data))});
+                    sendTbNet(TbNetName.updateActivityInfo, { data: JSON.parse(JSON.stringify(res.data)) });
                     Tools.gameData.prizeLevels = [];
                     for (let k in Tools.gameData.levelPrize) {
                         Tools.gameData.prizeLevels.push(+k.split('level')[1]);
                     }
                     Tools.gameData.prizeLevels.sort((a, b) => a - b);
+
+                    // @ts-ignore
+                    if (my && my.getServerTime) {
+                        // @ts-ignore
+                        my.getServerTime({
+                            success: (t) => {
+                                Tools.actEnd = (+res.data.endTime <= +t.time);
+                            },
+                            failed: () => {
+                                Tools.actEnd = (+res.data.endTime <= Date.now());
+                            }
+                        });
+                    } else {
+                        Tools.actEnd = (+res.data.endTime <= Date.now());
+                    }
+
                 }
                 r(s);
             })

src/scene/map/MapUI.ts

@@ -5,7 +5,7 @@ import TEXT_ALIGN = FYGE.TEXT_ALIGN;
 import MouseEvent = FYGE.MouseEvent;
 import { RES } from "../../../module/RES";
 import { Tools } from "../../Tools";
-import { showPanel } from "../../../module/ctrls";
+import { showPanel, showToast } from "../../../module/ctrls";
 import { RulePanel } from "../../panels/RulePanel";
 import { sendTbNet, TbNetName } from "../../TaoBaoNet";
 import { layers } from "../../../module/views/layers";
@@ -57,6 +57,10 @@ export default class MapUI extends Container {
                 break;
 
             case this.taskBtn:
+                if (Tools.actEnd) {
+                    showToast("活动已结束");
+                    return;
+                }
                 Tools.openTask();
                 break;