m

.idea/workspace.xml

@@ -3,17 +3,8 @@
   <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$/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$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/copyJs.js" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/copyJs.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/mergeJs.js" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/mergeJs.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/textureMerge.js" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/textureMerge.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ResJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ResJson.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/LoadingScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/LoadingScene.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$/tb/index/output.js" beforeDir="false" afterPath="$PROJECT_DIR$/tb/index/output.js" 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" />
@@ -143,7 +134,7 @@
       <updated>1612576978320</updated>
       <workItem from="1612576979459" duration="13000" />
       <workItem from="1612577003915" duration="21094000" />
-      <workItem from="1612662929222" duration="37313000" />
+      <workItem from="1612662929222" duration="39986000" />
     </task>
     <task id="LOCAL-00001" summary="斐乐消消乐">
       <created>1612581213298</created>
@@ -236,7 +227,14 @@
       <option name="project" value="LOCAL" />
       <updated>1612756277485</updated>
     </task>
-    <option name="localTasksCounter" value="14" />
+    <task id="LOCAL-00014" summary="m">
+      <created>1612771986437</created>
+      <option name="number" value="00014" />
+      <option name="presentableId" value="LOCAL-00014" />
+      <option name="project" value="LOCAL" />
+      <updated>1612771986437</updated>
+    </task>
+    <option name="localTasksCounter" value="15" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

src/panels/StartPanel.ts

@@ -45,7 +45,6 @@ export class StartPanel extends Panel {
         const chapterTxt = this.addChild(new FYGE.BitmapText(chapterTex));
         chapterTxt.text = "第" + (level >> 0) + "关";
         chapterTxt.position.set(375, 463);
-        console.log(chapterTxt)
 
         this.addChild(new StartTarget(level)).position.set(0, 613);
 

src/scene/map/MapUI.ts

@@ -8,6 +8,7 @@ import { Tools } from "../../Tools";
 import { showPanel } from "../../../module/ctrls";
 import { RulePanel } from "../../panels/RulePanel";
 import { sendTbNet, TbNetName } from "../../TaoBaoNet";
+import { layers } from "../../../module/views/layers";
 
 export default class MapUI extends Container {
     public energyBox: EnergyBox = null;
@@ -71,24 +72,28 @@ export default class MapUI extends Container {
     }
 
     private initUi() {
+        // const _y = (1624 - layers.stageOffsetY) / 1624 * 213;
+        const _y = layers.stageHeight * 0.1311576354679803;
+
         // 我的奖品
         this.myPrizeBtn = this.addChild(new Button(RES.getRes('map_prizeBtn.png')));
-        this.myPrizeBtn.position.set(617, 213);
+        this.myPrizeBtn.position.set(617, _y);
         this.myPrizeBtn.anchorX = 133;
 
         // 规则按钮
         this.ruleBtn = this.addChild(new Button(RES.getRes('map_ruleBtn.png')));
-        this.ruleBtn.position.set(0, 213);
+        this.ruleBtn.position.set(0, _y);
         this.ruleBtn.anchorX = 0;
 
         // 任务按钮
         this.taskBtn = this.addChild(new Button(RES.getRes('map_taskBtn.png')));
-        this.taskBtn.position.set(613, 278);
+        this.taskBtn.position.set(613, _y + 65);
 
         this.energyBox = this.addChild(new EnergyBox({}));
+        this.energyBox.position.set(8, _y + 65);
 
         this.clearanceBtn = this.addChild(new Button(RES.getRes('clearanceBtn.png')));
-        this.clearanceBtn.position.set(0, 387);
+        this.clearanceBtn.position.set(0, _y + 174);
         this.clearanceBtn.visible = false;
     }
 
@@ -120,7 +125,6 @@ class EnergyBox extends Container {
     }
 
     private initUi(data) {
-        this.position.set(8, 278);
 
         this.addChild(Tools.getSprite('map_energyBg.png'));