m

.idea/workspace.xml

@@ -5,8 +5,10 @@
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/LotteryPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/LotteryPanel.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/scene/map/MapUI.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapUI.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TaoBaoNet.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/TaoBaoNet.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/panels/StartPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/StartPanel.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/scene/map/CheckBtn.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/CheckBtn.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -133,7 +135,7 @@
       <workItem from="1612577003915" duration="21094000" />
       <workItem from="1612662929222" duration="40609000" />
       <workItem from="1613698993022" duration="22309000" />
-      <workItem from="1613785579125" duration="12271000" />
+      <workItem from="1613785579125" duration="14750000" />
     </task>
     <task id="LOCAL-00001" summary="斐乐消消乐">
       <created>1612581213298</created>
@@ -366,7 +368,14 @@
       <option name="project" value="LOCAL" />
       <updated>1613810042956</updated>
     </task>
-    <option name="localTasksCounter" value="34" />
+    <task id="LOCAL-00034" summary="m">
+      <created>1613810371864</created>
+      <option name="number" value="00034" />
+      <option name="presentableId" value="LOCAL-00034" />
+      <option name="project" value="LOCAL" />
+      <updated>1613810371864</updated>
+    </task>
+    <option name="localTasksCounter" value="35" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

output.js

@@ -7836,6 +7836,7 @@ var TbNetName;
     TbNetName["receiveEnamePrize"] = "feile.receiveEnamePrize";
     TbNetName["getRemainTimes"] = "feile.getRemainTimes";
     TbNetName["getActivityBaseInfoById"] = "feile.getActivityBaseInfoById";
+    TbNetName["updateActivityInfo"] = "mine.updateActivityInfo";
     TbNetName["getToolsInfo"] = "feile.getToolsInfo";
     TbNetName["consumerTools"] = "feile.consumerTools";
     TbNetName["dojoin"] = "feile.doJoin";
@@ -8026,6 +8027,8 @@ var Tools = (function () {
             TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.getActivityBaseInfoById, {}, function (s, res) {
                 if (s) {
                     _this.gameData = res.data;
+                    console.log(1111);
+                    TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.updateActivityInfo, { data: JSON.parse(JSON.stringify(res.data)) });
                     Tools.gameData.prizeLevels = [];
                     for (var k in Tools.gameData.levelPrize) {
                         Tools.gameData.prizeLevels.push(+k.split('level')[1]);
@@ -11241,6 +11244,7 @@ var ctrls_1 = __webpack_require__(/*! ../../module/ctrls */ "./module/ctrls/inde
 var TaoBaoNet_1 = __webpack_require__(/*! ../TaoBaoNet */ "./src/TaoBaoNet.ts");
 var GTool_1 = __webpack_require__(/*! ../../module/tools/GTool */ "./module/tools/GTool.ts");
 var Panel_1 = __webpack_require__(/*! ../../module/views/Panel */ "./module/views/Panel.ts");
+var Tools_1 = __webpack_require__(/*! ../Tools */ "./src/Tools.ts");
 var LotteryPanel = (function (_super) {
     __extends(LotteryPanel, _super);
     function LotteryPanel() {
@@ -11350,6 +11354,7 @@ var LotteryPanel = (function (_super) {
             ctrls_1.hideWaiting();
             if (!res.success)
                 return;
+            Tools_1.Tools.gameData.isDrawTopLevelPrize = true;
             var id;
             if (res.data && res.data.type == 5) {
                 id = 'thanks';
@@ -14878,14 +14883,6 @@ var CheckBtn = (function (_super) {
             this.starCount = data.stars;
             this.checkData = data;
             this.checkData.isPlayed = true;
-            this._sendAwardType = data.sendAwardType;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(CheckBtn.prototype, "sendAwardType", {
-        get: function () {
-            return this._sendAwardType;
         },
         enumerable: false,
         configurable: true
@@ -15582,6 +15579,7 @@ var MapUI = (function (_super) {
         this.clearanceBtn.removeEventListener(MouseEvent.CLICK, this.clickBtn, this);
     };
     MapUI.prototype.clickBtn = function (e) {
+        var _this = this;
         switch (e.target) {
             case this.ruleBtn:
                 ctrls_1.showPanel(RulePanel_1.RulePanel);
@@ -15594,7 +15592,7 @@ var MapUI = (function (_super) {
                 Tools_1.Tools.openTask();
                 break;
             case this.clearanceBtn:
-                ctrls_1.showPanel(LotteryPanel_1.LotteryPanel, { callFun: function () { return 0; } });
+                ctrls_1.showPanel(LotteryPanel_1.LotteryPanel, { callFun: function () { return _this.updateUI(); } });
                 break;
         }
     };

src/TaoBaoNet.ts

@@ -22,6 +22,8 @@ export enum TbNetName {
      * @type {string}
      */
     getActivityBaseInfoById = "feile.getActivityBaseInfoById",
+    updateActivityInfo = "mine.updateActivityInfo",
+    openMember = "mine.openMember",
 
     /**
      * 获取道具信息
@@ -160,6 +162,7 @@ export enum TbNetName {
      * isOn
      */
     openMusic = "mine.openMusic",
+
 }
 
 //返回数据类型，到时再调整

src/Tools.ts

@@ -78,6 +78,7 @@ export class Tools {
             sendTbNet(TbNetName.getActivityBaseInfoById, {}, (s, res) => {
                 if (s) {
                     this.gameData = 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]);

src/panels/StartPanel.ts

 import { Panel } from "../../module/views/Panel";
-import { changeScene, showPanel } from "../../module/ctrls";
+import { changeScene, showPanel, showToast } from "../../module/ctrls";
 import { PlayScene } from "../scene/PlayScene";
 import { Tools } from "../Tools";
 import { sendTbNet, TbNetName } from "../TaoBaoNet";
@@ -96,9 +96,17 @@ export class StartPanel extends Panel {
             return;
         }
         sendTbNet(TbNetName.dojoin, { level: this.data.level },
-            (success, res) => {
+            async (success, res) => {
                 this.enableMouseEvt(true);
-                if (!success) return;
+                if (!success) {
+                    if (res.data && !res.data.isvip) {
+                        showToast('请入会后参与');
+                        setTimeout(() => {
+                            sendTbNet(TbNetName.openMember);
+                        }, 1600);
+                    }
+                    return;
+                }
 
                 // Tools.gameData.power = res.data.power;
                 changeScene(PlayScene, { chapter: this.data.level });

src/scene/map/CheckBtn.ts

@@ -35,8 +35,6 @@ export default class CheckBtn extends Container {
         isPlayed: false,
     };
 
-    private _sendAwardType: any;
-
     private btn: Button = null;
     private checkTxt: BitmapText = null;
 
@@ -55,12 +53,6 @@ export default class CheckBtn extends Container {
 
         this.checkData = data;
         this.checkData.isPlayed = true;
-
-        this._sendAwardType = data.sendAwardType;
-    }
-
-    public get sendAwardType() {
-        return this._sendAwardType;
     }
 
     private _starCount = 0;