m

.idea/workspace.xml

@@ -3,9 +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$/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" />
+      <change beforePath="$PROJECT_DIR$/src/panels/RulePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/RulePanel.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -133,7 +134,7 @@
       <workItem from="1612662929222" duration="40609000" />
       <workItem from="1613698993022" duration="22309000" />
       <workItem from="1613785579125" duration="17751000" />
-      <workItem from="1613958457445" duration="6710000" />
+      <workItem from="1613958457445" duration="7651000" />
     </task>
     <task id="LOCAL-00001" summary="斐乐消消乐">
       <created>1612581213298</created>
@@ -429,7 +430,14 @@
       <option name="project" value="LOCAL" />
       <updated>1614048624668</updated>
     </task>
-    <option name="localTasksCounter" value="43" />
+    <task id="LOCAL-00043" summary="m">
+      <created>1614049858546</created>
+      <option name="number" value="00043" />
+      <option name="presentableId" value="LOCAL-00043" />
+      <option name="project" value="LOCAL" />
+      <updated>1614049858546</updated>
+    </task>
+    <option name="localTasksCounter" value="44" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

mock/miniTb/feile.getActivityBaseInfoById.json

@@ -29,7 +29,7 @@
         "isPrizeLevel": false
       }
     ],
-    "rule": "测试活动规则",
+    "rule": "测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则",
     "levelPrize": {
       "level50": "https://img.alicdn.com/imgextra/i4/2275046294/O1CN01rG9iDU1wMhRtEnjA8_!!2275046294-2-miniprogram.png",
       "level99": "https://img.alicdn.com/imgextra/i1/2275046294/O1CN01Sytynw1wMhRuqjy5V_!!2275046294-2-miniprogram.png"

output.js

@@ -8090,12 +8090,12 @@ var Tools = (function () {
         });
     };
     Tools.gameOver = function (data) {
-        if (data.level == Tools.maxLevel) {
-            ctrls_1.showPanel(SuccessNoPrizePanel_1.SuccessNoPrizePanel, data);
-        }
-        else if (!data.isVisitSuccess) {
+        if (!data.isVisitSuccess) {
             ctrls_1.showPanel(FailedPanel_1.FailedPanel, data);
         }
+        else if (data.level == Tools.maxLevel) {
+            ctrls_1.showPanel(SuccessNoPrizePanel_1.SuccessNoPrizePanel, data);
+        }
         else if (data.prize && data.prize.type != 5) {
             ctrls_1.showPanel(SuccessPrizePanel_1.SuccessPrizePanel, data);
         }

src/panels/RulePanel.ts

@@ -27,6 +27,11 @@ export class RulePanel extends Panel {
     start(data) {
         super.start();
 
+        this.addChild(Tools.getText(
+            "活动规则", 38, '#892a1a',
+            FYGE.TEXT_ALIGN.CENTER, 570, 96,510
+        ));
+
         const rule = Tools.gameData.rule;
         this.ruleTex = this.addChild(Tools.getText(
             rule, 26, '#892a1a',
@@ -35,9 +40,9 @@ export class RulePanel extends Panel {
         this.ruleTex.lineType = TEXT_lINETYPE.MULTI;
 
         this.scroll = this.addChild(new ScrollPage(
-            570, 600, this.ruleTex.textHeight + 30
+            570, 500, this.ruleTex.textHeight + 30
         ));
-        this.scroll.position.set(96, 549);
+        this.scroll.position.set(96, 580);
         this.scroll.view.addChild(this.ruleTex);
 
         this.addChild(new Button(RES.getRes('ruleBtn.png')))