Commit 137e1165 authored by 邱旭's avatar 邱旭

m

parent f3480837
...@@ -2,9 +2,8 @@ ...@@ -2,9 +2,8 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="0d3cb18d-e144-41a0-bc8b-4877c2e1fef1" name="默认的" comment=""> <list default="true" id="0d3cb18d-e144-41a0-bc8b-4877c2e1fef1" name="默认的" comment="">
<change afterPath="$PROJECT_DIR$/resource/SuccessPanel/star_dis.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/PlayScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/PlayScene.ts" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -63,7 +62,7 @@ ...@@ -63,7 +62,7 @@
<recent name="$PROJECT_DIR$/lotties" /> <recent name="$PROJECT_DIR$/lotties" />
</key> </key>
</component> </component>
<component name="RunManager" selected="npm.build"> <component name="RunManager" selected="npm.dev">
<configuration name="build" type="js.build_tools.npm" temporary="true" nameIsGenerated="true"> <configuration name="build" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
<package-json value="$PROJECT_DIR$/package.json" /> <package-json value="$PROJECT_DIR$/package.json" />
<command value="run" /> <command value="run" />
...@@ -112,9 +111,9 @@ ...@@ -112,9 +111,9 @@
</list> </list>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="npm.dev" />
<item itemvalue="npm.build" /> <item itemvalue="npm.build" />
<item itemvalue="npm.flushRes" /> <item itemvalue="npm.flushRes" />
<item itemvalue="npm.dev" />
<item itemvalue="npm.buildTS" /> <item itemvalue="npm.buildTS" />
</list> </list>
</recent_temporary> </recent_temporary>
...@@ -137,14 +136,9 @@ ...@@ -137,14 +136,9 @@
<workItem from="1614219160308" duration="168000" /> <workItem from="1614219160308" duration="168000" />
<workItem from="1614221954923" duration="158000" /> <workItem from="1614221954923" duration="158000" />
<workItem from="1614222264040" duration="190000" /> <workItem from="1614222264040" duration="190000" />
<workItem from="1614233975998" duration="374000" /> <workItem from="1614233975998" duration="711000" />
</task> <workItem from="1614235659466" duration="11000" />
<task id="LOCAL-00010" summary="20210206"> <workItem from="1614565309616" duration="1296000" />
<created>1612669957818</created>
<option name="number" value="00010" />
<option name="presentableId" value="LOCAL-00010" />
<option name="project" value="LOCAL" />
<updated>1612669957818</updated>
</task> </task>
<task id="LOCAL-00011" summary="20210206"> <task id="LOCAL-00011" summary="20210206">
<created>1612677219614</created> <created>1612677219614</created>
...@@ -482,7 +476,14 @@ ...@@ -482,7 +476,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1614222109444</updated> <updated>1614222109444</updated>
</task> </task>
<option name="localTasksCounter" value="59" /> <task id="LOCAL-00059" summary="m">
<created>1614234543813</created>
<option name="number" value="00059" />
<option name="presentableId" value="LOCAL-00059" />
<option name="project" value="LOCAL" />
<updated>1614234543813</updated>
</task>
<option name="localTasksCounter" value="60" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
......
...@@ -260,7 +260,7 @@ export class PlayScene extends Scene { ...@@ -260,7 +260,7 @@ export class PlayScene extends Scene {
this.addChild(FYGE.Sprite.fromFrame("playBg.jpg")).position.set(0, -layers.stageOffsetY); this.addChild(FYGE.Sprite.fromFrame("playBg.jpg")).position.set(0, -layers.stageOffsetY);
//排版 //排版
//底部背景 //底部背景
this.addChild(FYGE.Sprite.fromFrame("topBg.png")).position.set(25, -170); this.addChild(FYGE.Sprite.fromFrame("topBg.png")).position.set(25, -120);
const commonTextArr = {}; const commonTextArr = {};
for (let i = 0; i < 10; i++)commonTextArr[i] = RES.getRes("scoreNum" + i + ".png"); for (let i = 0; i < 10; i++)commonTextArr[i] = RES.getRes("scoreNum" + i + ".png");
...@@ -270,7 +270,7 @@ export class PlayScene extends Scene { ...@@ -270,7 +270,7 @@ export class PlayScene extends Scene {
this.targetScoreTxt.position.set(118, 283); this.targetScoreTxt.position.set(118, 283);
//设置 //设置
this.musicBtn = this.addChild(new MusicBtn()); this.musicBtn = this.addChild(new MusicBtn());
this.musicBtn.position.set(616, 66); this.musicBtn.position.set(616, 116);
} }
data: { chapter: number } data: { chapter: number }
start(data: { chapter: number }) { start(data: { chapter: number }) {
...@@ -371,15 +371,15 @@ export class PlayScene extends Scene { ...@@ -371,15 +371,15 @@ export class PlayScene extends Scene {
["第", "关"].forEach((e) => { chapterTex[e] = RES.getRes("chapterNum" + e + ".png") }) ["第", "关"].forEach((e) => { chapterTex[e] = RES.getRes("chapterNum" + e + ".png") })
const chapterTxt = this.addChild(new FYGE.BitmapText(chapterTex)); const chapterTxt = this.addChild(new FYGE.BitmapText(chapterTex));
chapterTxt.text = "第" + (this.chapter >> 0) + "关"; chapterTxt.text = "第" + (this.chapter >> 0) + "关";
chapterTxt.position.set(620, 179); chapterTxt.position.set(620, 229);
//步数 //步数
this.stepNumber = this.addChild(new FYGE.BitmapText(Tools.getNumTextures("stepNum"))); this.stepNumber = this.addChild(new FYGE.BitmapText(Tools.getNumTextures("stepNum")));
this.stepNumber.position.set(127, 162); this.stepNumber.position.set(127, 212);
//步数初始化 //步数初始化
this.steps = this.chapterData.stepCount; this.steps = this.chapterData.stepCount;
//分数进度条,托管 //分数进度条,托管
this.scoreProgress = this.addChild(new ScoreProgress(this.chapterData.starScores)); this.scoreProgress = this.addChild(new ScoreProgress(this.chapterData.starScores));
this.scoreProgress.position.set(94, 221); this.scoreProgress.position.set(94, 271);
//分数置0 //分数置0
this.score = 0; this.score = 0;
//地图生成 //地图生成
...@@ -434,7 +434,7 @@ export class PlayScene extends Scene { ...@@ -434,7 +434,7 @@ export class PlayScene extends Scene {
} }
this.elementTargets = new ElementTargets(this.passElements); this.elementTargets = new ElementTargets(this.passElements);
this.elementTargets.x = 375; this.elementTargets.x = 375;
this.elementTargets.y = 120; this.elementTargets.y = 170;
this.addChild(this.elementTargets); this.addChild(this.elementTargets);
this.targetScoreTxt.visible = false; this.targetScoreTxt.visible = false;
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment