换了点皮

.idea/workspace.xml

@@ -3,29 +3,12 @@
   <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$/resource/map/map_check1_0.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/map/map_check1_1.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/map/map_check1_2.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/map/map_check1_3.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/map/map_check1_4.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/map/map_check1_5.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/map/map_check1_6.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/map/map_check1_7.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/map/map_check1_8.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/map/map_check1_9.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/map/map_check2_0.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/map/map_check2_1.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/map/map_check2_2.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/map/map_check2_3.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/map/map_check2_4.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/map/map_check2_5.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/map/map_check2_6.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/map/map_check2_7.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/map/map_check2_8.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/map/map_check2_9.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/resource/res.json" beforeDir="false" afterPath="$PROJECT_DIR$/resource/res.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ResJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ResJson.ts" 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$/mock/miniTb/mine.getAppData.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/mine.getAppData.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/RulePanel/ruleBtn.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/RulePanel/ruleBtn.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/RulePanel/活动规则背景.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/RulePanel/活动规则背景.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resource/common/关闭按钮.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/关闭按钮.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SkinJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/SkinJson.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" />
@@ -219,14 +202,7 @@
       <workItem from="1617871191619" duration="121000" />
       <workItem from="1617890665920" duration="181000" />
       <workItem from="1617960804439" duration="639000" />
-      <workItem from="1618193237335" duration="3648000" />
-    </task>
-    <task id="LOCAL-00029" summary="m">
-      <created>1613789148084</created>
-      <option name="number" value="00029" />
-      <option name="presentableId" value="LOCAL-00029" />
-      <option name="project" value="LOCAL" />
-      <updated>1613789148084</updated>
+      <workItem from="1618193237335" duration="4013000" />
     </task>
     <task id="LOCAL-00030" summary="m">
       <created>1613792877469</created>
@@ -564,7 +540,14 @@
       <option name="project" value="LOCAL" />
       <updated>1618196731017</updated>
     </task>
-    <option name="localTasksCounter" value="78" />
+    <task id="LOCAL-00078" summary="换了点皮">
+      <created>1618196900268</created>
+      <option name="number" value="00078" />
+      <option name="presentableId" value="LOCAL-00078" />
+      <option name="project" value="LOCAL" />
+      <updated>1618196900268</updated>
+    </task>
+    <option name="localTasksCounter" value="79" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

mock/miniTb/mine.getAppData.json

@@ -7,7 +7,7 @@
         "openId": "openId",
         "isFirstLogin": true,
         "loginAddPower": 0,
-        "isNewUser": true,
+        "isNewUser": false,
         "inviteId": "",
         "isFollow": true
     }

src/SkinJson.ts

@@ -11,8 +11,8 @@ export const SkinJson = {
             "children": [
                 {
                     "name": "活动规则背景",
-                    "x": 55,
-                    "y": 438,
+                    "x": 80,
+                    "y": 310,
                     "type": "sprite",
                     "props": {
                         "source": "活动规则背景.png"
@@ -20,8 +20,8 @@ export const SkinJson = {
                 },
                 {
                     "name": "关闭按钮",
-                    "x": 651,
-                    "y": 415,
+                    "x": 629,
+                    "y": 282,
                     "type": "button",
                     "props": {
                         "tUp": "关闭按钮.png"

src/panels/RulePanel.ts

@@ -27,27 +27,22 @@ 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',
-            FYGE.TEXT_ALIGN.LEFT, 570
+            rule, 26, '#fffeef',
+            FYGE.TEXT_ALIGN.LEFT, 530
         ));
         this.ruleTex.lineType = TEXT_lINETYPE.MULTI;
 
         this.scroll = this.addChild(new ScrollPage(
-            570, 500, this.ruleTex.textHeight + 30
+            570, 590, this.ruleTex.textHeight + 30
         ));
-        this.scroll.position.set(96, 580);
+        this.scroll.position.set(119, 445);
         this.scroll.view.addChild(this.ruleTex);
 
         this.addChild(new Button(RES.getRes('ruleBtn.png')))
             .addEventListener(MouseEvent.CLICK, () => this.hidePanel())
-            .position.set(192, 1095);
+            .position.set(185, 1063);
 
     }