m

.idea/workspace.xml

@@ -3,10 +3,10 @@
   <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/feile.getActivityBaseInfoById.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/feile.getActivityBaseInfoById.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mock/miniTb/feile.drawTopLevelPrize.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/feile.drawTopLevelPrize.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/LotteryPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/LotteryPanel.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/panels/SuccessNoPrizePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/SuccessNoPrizePanel.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" />
@@ -133,7 +133,7 @@
       <workItem from="1612577003915" duration="21094000" />
       <workItem from="1612662929222" duration="40609000" />
       <workItem from="1613698993022" duration="22309000" />
-      <workItem from="1613785579125" duration="7288000" />
+      <workItem from="1613785579125" duration="11959000" />
     </task>
     <task id="LOCAL-00001" summary="斐乐消消乐">
       <created>1612581213298</created>
@@ -352,7 +352,14 @@
       <option name="project" value="LOCAL" />
       <updated>1613792960890</updated>
     </task>
-    <option name="localTasksCounter" value="32" />
+    <task id="LOCAL-00032" summary="m">
+      <created>1613793806573</created>
+      <option name="number" value="00032" />
+      <option name="presentableId" value="LOCAL-00032" />
+      <option name="project" value="LOCAL" />
+      <updated>1613793806573</updated>
+    </task>
+    <option name="localTasksCounter" value="33" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

mock/miniTb/feile.drawTopLevelPrize.json

@@ -5,7 +5,7 @@
     "data": {
         "_id": 1,
         "name": "aa",
-        "type": 1,
+        "type": 5,
         "image": 1,
         "drawStatus": 1,
         "prizeId": "5f213ff7738989c8b3f46f4d"

output.js

@@ -11241,7 +11241,6 @@ 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 MapScene_1 = __webpack_require__(/*! ../scene/map/MapScene */ "./src/scene/map/MapScene.ts");
 var LotteryPanel = (function (_super) {
     __extends(LotteryPanel, _super);
     function LotteryPanel() {
@@ -11269,7 +11268,6 @@ var LotteryPanel = (function (_super) {
         this.addChild(new FYGE.Sprite(RES_1.RES.getRes("lotteryReturnBtn.png")))
             .addEventListener(FYGE.MouseEvent.CLICK, function () {
             _this.hidePanel();
-            ctrls_1.changeScene(MapScene_1.MapScene);
         }, this)
             .position.set(0, 250);
         this.updatePrizes();
@@ -11292,6 +11290,7 @@ var LotteryPanel = (function (_super) {
                     else {
                         ctrls_1.showToast('奖品发放失败\n请前往我的奖品处进行处理');
                     }
+                    _this.data.callFun && _this.data.callFun();
                     _this.hidePanel();
                 }, true);
                 break;
@@ -11310,6 +11309,10 @@ var LotteryPanel = (function (_super) {
                 break;
         }
     };
+    LotteryPanel.prototype.hidePanel = function () {
+        this.data.callFun && this.data.callFun();
+        _super.prototype.hidePanel.call(this);
+    };
     LotteryPanel.prototype.updatePrizes = function () {
         return __awaiter(this, void 0, void 0, function () {
             var prizeList, list, p;
@@ -11938,12 +11941,12 @@ var Tools_1 = __webpack_require__(/*! ../Tools */ "./src/Tools.ts");
 var RES_1 = __webpack_require__(/*! ../../module/RES */ "./module/RES.ts");
 var ctrls_1 = __webpack_require__(/*! ../../module/ctrls */ "./module/ctrls/index.ts");
 var MapScene_1 = __webpack_require__(/*! ../scene/map/MapScene */ "./src/scene/map/MapScene.ts");
+var LotteryPanel_1 = __webpack_require__(/*! ./LotteryPanel */ "./src/panels/LotteryPanel.ts");
 var Container = FYGE.Container;
 var Tween = FYGE.Tween;
 var Ease = FYGE.Ease;
 var MouseEvent = FYGE.MouseEvent;
 var Button = FYGE.Button;
-var LotteryPanel_1 = __webpack_require__(/*! ./LotteryPanel */ "./src/panels/LotteryPanel.ts");
 var SuccessNoPrizePanel = (function (_super) {
     __extends(SuccessNoPrizePanel, _super);
     function SuccessNoPrizePanel() {
@@ -11976,7 +11979,7 @@ var SuccessNoPrizePanel = (function (_super) {
         starGroup.position.set(375, 600);
         starGroup.play(stars);
         var tipLabel = this.addChild(Tools_1.Tools.getText("闯关成功！", 36, "#744f1d", FYGE.TEXT_ALIGN.CENTER, 750, 0, 713));
-        if (level == Tools_1.Tools.maxLevel) {
+        if (level == Tools_1.Tools.maxLevel && !Tools_1.Tools.gameData.isDrawTopLevelPrize) {
             tipLabel.text = '成功通关！\n获得一次抽奖机会！';
             this.addChild(new Button(RES_1.RES.getRes("sucGoPrize.png")))
                 .addEventListener(MouseEvent.CLICK, this.goPrize, this)
@@ -12010,7 +12013,7 @@ var SuccessNoPrizePanel = (function (_super) {
         _super.prototype.hidePanel.call(this);
     };
     SuccessNoPrizePanel.prototype.goPrize = function () {
-        ctrls_1.showPanel(LotteryPanel_1.LotteryPanel);
+        ctrls_1.showPanel(LotteryPanel_1.LotteryPanel, { callFun: function () { return ctrls_1.changeScene(MapScene_1.MapScene); } });
         _super.prototype.hidePanel.call(this);
     };
     SuccessNoPrizePanel.prototype.continue = function () {
@@ -12719,15 +12722,15 @@ var PlayScene = (function (_super) {
     });
     PlayScene.prototype.initUi = function () {
         this.addChild(FYGE.Sprite.fromFrame("playBg.jpg")).position.set(0, -layers_1.layers.stageOffsetY);
-        this.addChild(FYGE.Sprite.fromFrame("topBg.png")).position.set(25, -150);
+        this.addChild(FYGE.Sprite.fromFrame("topBg.png")).position.set(25, -170);
         var commonTextArr = {};
         for (var i = 0; i < 10; i++)
             commonTextArr[i] = RES_1.RES.getRes("scoreNum" + i + ".png");
         commonTextArr["当"] = RES_1.RES.getRes("scoreNum当.png");
         this.targetScoreTxt = this.addChild(new FYGE.BitmapText(commonTextArr));
-        this.targetScoreTxt.position.set(118, 293);
+        this.targetScoreTxt.position.set(118, 283);
         this.musicBtn = this.addChild(new MusicBtn());
-        this.musicBtn.position.set(616, 86);
+        this.musicBtn.position.set(616, 66);
     };
     PlayScene.prototype.start = function (data) {
         var _this = this;
@@ -12791,12 +12794,12 @@ var PlayScene = (function (_super) {
         ["第", "关"].forEach(function (e) { chapterTex[e] = RES_1.RES.getRes("chapterNum" + e + ".png"); });
         var chapterTxt = this.addChild(new FYGE.BitmapText(chapterTex));
         chapterTxt.text = "第" + (this.chapter >> 0) + "关";
-        chapterTxt.position.set(620, 199);
+        chapterTxt.position.set(620, 179);
         this.stepNumber = this.addChild(new FYGE.BitmapText(Tools_1.Tools.getNumTextures("stepNum")));
-        this.stepNumber.position.set(127, 182);
+        this.stepNumber.position.set(127, 162);
         this.steps = this.chapterData.stepCount;
         this.scoreProgress = this.addChild(new ScoreProgress_1.ScoreProgress(this.chapterData.starScores));
-        this.scoreProgress.position.set(94, 241);
+        this.scoreProgress.position.set(94, 221);
         this.score = 0;
         var path = aaa_1.generateMapBg(this.chapterData.map.lattices);
         var bg = aaa_1.drawBg(path, this.chapterData.map.lattices);
@@ -12833,7 +12836,7 @@ var PlayScene = (function (_super) {
             }
             this.elementTargets = new ElementTargets_1.ElementTargets(this.passElements);
             this.elementTargets.x = 375;
-            this.elementTargets.y = 140;
+            this.elementTargets.y = 120;
             this.addChild(this.elementTargets);
             this.targetScoreTxt.visible = false;
         }
@@ -15580,7 +15583,7 @@ var MapUI = (function (_super) {
                 Tools_1.Tools.openTask();
                 break;
             case this.clearanceBtn:
-                ctrls_1.showPanel(LotteryPanel_1.LotteryPanel);
+                ctrls_1.showPanel(LotteryPanel_1.LotteryPanel, { callFun: function () { return 0; } });
                 break;
         }
     };
@@ -16576,7 +16579,7 @@ var Pool_1 = __webpack_require__(/*! ../Pool */ "./src/something/Pool.ts");
 var RecoverName_1 = __webpack_require__(/*! ../enum/RecoverName */ "./src/something/enum/RecoverName.ts");
 var RES_1 = __webpack_require__(/*! ../../../module/RES */ "./module/RES.ts");
 var Tool_1 = __webpack_require__(/*! ../Tool */ "./src/something/Tool.ts");
-exports.stepPosition = [130, 155, 100];
+exports.stepPosition = [130, 135, 100];
 var BonusShootAni = (function (_super) {
     __extends(BonusShootAni, _super);
     function BonusShootAni() {
@@ -27698,7 +27701,7 @@ var PropBtnCon = (function (_super) {
         _this.boomNum = _this.addChild(new FYGE.BitmapText(arr));
         _this.hammerNum = _this.addChild(new FYGE.BitmapText(arr));
         _this.stepNum.y = _this.boomNum.y = _this.hammerNum.y = 100;
-        _this.stepNum.text = _this.boomNum.text = _this.hammerNum.text = "13";
+        _this.stepNum.text = _this.boomNum.text = _this.hammerNum.text = "0";
         _this.stepNum.textAlign = _this.boomNum.textAlign = _this.hammerNum.textAlign = FYGE.TEXT_ALIGN.CENTER;
         _this.stepNum.x = 239;
         _this.boomNum.x = 239 + 186;
@@ -27773,7 +27776,6 @@ var Tool_1 = __webpack_require__(/*! ../Tool */ "./src/something/Tool.ts");
 var RES_1 = __webpack_require__(/*! ../../../module/RES */ "./module/RES.ts");
 var PropType_1 = __webpack_require__(/*! ../enum/PropType */ "./src/something/enum/PropType.ts");
 var BonusShootAni_1 = __webpack_require__(/*! ../anis/BonusShootAni */ "./src/something/anis/BonusShootAni.ts");
-var Sprite = FYGE.Sprite;
 var PropGuide = (function (_super) {
     __extends(PropGuide, _super);
     function PropGuide(offsetY) {
@@ -27795,14 +27797,13 @@ var PropGuide = (function (_super) {
         var text = new FYGE.TextField();
         text.text = "为本次增加额外5次步数";
         text.fillColor = "#ffffff";
-        text.size = 20;
-        text.y = offsetY - 88;
+        text.size = 30;
+        text.y = offsetY - 24;
         text.textAlign = FYGE.TEXT_ALIGN.CENTER;
         text.textWidth = 750;
+        text.mouseEnable = false;
         _this.addChild(text);
         _this.msgTxt = text;
-        var cancel = _this.addChild(new Sprite(RES_1.RES.getRes("propCancel.png")));
-        cancel.position.set(274, offsetY - 60);
         return _this;
     }
     PropGuide.prototype.init = function (prop) {

src/panels/LotteryPanel.ts

 import { RES } from "../../module/RES";
-import { changeScene, hideWaiting, showToast, showWaiting, wait } from "../../module/ctrls";
+import { hideWaiting, showToast, showWaiting, wait } from "../../module/ctrls";
 import { sendTbNet, TbNetName } from "../TaoBaoNet";
 import { GTool } from "../../module/tools/GTool";
 // import { MapScene } from "./map/MapScene";
 import { Panel } from "../../module/views/Panel";
-import { MapScene } from "../scene/map/MapScene";
 
 /**
  * 摇奖机弹框
@@ -112,6 +111,13 @@ export class LotteryPanel extends Panel {
         // scroll.updateData(list || [])
         //摇奖部分
         var p = [91, 731]
+        list.push({
+            activityId: "602f33eb086e65bb22759048",
+            image: "https://yun.duiba.com.cn/aurora/assets/20a5c02da9d2eb507af7f5dda581083798e8aa84.png",
+            name: "谢谢参与",
+            type: 5,
+            _id: "thanks",
+        });
         this.lotScroll = this.addChild(new LotteryScroll(list))
         this.lotScroll.position.set(p[0], p[1]);
         console.log(this.lotScroll.position)
@@ -124,7 +130,11 @@ export class LotteryPanel extends Panel {
                 //如果是失败
                 if (!res.success) return;
                 let id;//待考虑，谢谢参与要进哪？是否进列表，下面id不存在时当作无奖励，（如果谢谢参与不进列表）
-                if (res.data && res.data.prizeId) id = res.data.prizeId;
+                if (res.data && res.data.type == 5) {
+                    id = 'thanks';
+                } else if (res.data && res.data.prizeId) {
+                    id = res.data.prizeId;
+                }
                 this.enableMouseEvt(false);
                 console.log(id)
                 this.prizeData = res.data;