Commit af069d44 authored by 邱旭's avatar 邱旭

m

parent 137e1165
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
<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 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/scene/PlayScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/PlayScene.ts" 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" />
</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" />
...@@ -62,7 +63,7 @@ ...@@ -62,7 +63,7 @@
<recent name="$PROJECT_DIR$/lotties" /> <recent name="$PROJECT_DIR$/lotties" />
</key> </key>
</component> </component>
<component name="RunManager" selected="npm.dev"> <component name="RunManager" selected="npm.buildTS">
<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" />
...@@ -111,10 +112,10 @@ ...@@ -111,10 +112,10 @@
</list> </list>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="npm.buildTS" />
<item itemvalue="npm.dev" /> <item itemvalue="npm.dev" />
<item itemvalue="npm.build" /> <item itemvalue="npm.build" />
<item itemvalue="npm.flushRes" /> <item itemvalue="npm.flushRes" />
<item itemvalue="npm.buildTS" />
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
...@@ -138,14 +139,7 @@ ...@@ -138,14 +139,7 @@
<workItem from="1614222264040" duration="190000" /> <workItem from="1614222264040" duration="190000" />
<workItem from="1614233975998" duration="711000" /> <workItem from="1614233975998" duration="711000" />
<workItem from="1614235659466" duration="11000" /> <workItem from="1614235659466" duration="11000" />
<workItem from="1614565309616" duration="1296000" /> <workItem from="1614565309616" duration="1984000" />
</task>
<task id="LOCAL-00011" summary="20210206">
<created>1612677219614</created>
<option name="number" value="00011" />
<option name="presentableId" value="LOCAL-00011" />
<option name="project" value="LOCAL" />
<updated>1612677219614</updated>
</task> </task>
<task id="LOCAL-00012" summary="m"> <task id="LOCAL-00012" summary="m">
<created>1612687050300</created> <created>1612687050300</created>
...@@ -483,7 +477,14 @@ ...@@ -483,7 +477,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1614234543813</updated> <updated>1614234543813</updated>
</task> </task>
<option name="localTasksCounter" value="60" /> <task id="LOCAL-00060" summary="m">
<created>1614566625427</created>
<option name="number" value="00060" />
<option name="presentableId" value="LOCAL-00060" />
<option name="project" value="LOCAL" />
<updated>1614566625427</updated>
</task>
<option name="localTasksCounter" value="61" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
......
...@@ -13031,7 +13031,7 @@ var PlayScene = (function (_super) { ...@@ -13031,7 +13031,7 @@ var PlayScene = (function (_super) {
}); });
PlayScene.prototype.initUi = function () { PlayScene.prototype.initUi = function () {
this.addChild(FYGE.Sprite.fromFrame("playBg.jpg")).position.set(0, -layers_1.layers.stageOffsetY); this.addChild(FYGE.Sprite.fromFrame("playBg.jpg")).position.set(0, -layers_1.layers.stageOffsetY);
this.addChild(FYGE.Sprite.fromFrame("topBg.png")).position.set(25, -170); this.addChild(FYGE.Sprite.fromFrame("topBg.png")).position.set(25, -120);
var commonTextArr = {}; var commonTextArr = {};
for (var i = 0; i < 10; i++) for (var i = 0; i < 10; i++)
commonTextArr[i] = RES_1.RES.getRes("scoreNum" + i + ".png"); commonTextArr[i] = RES_1.RES.getRes("scoreNum" + i + ".png");
...@@ -13039,7 +13039,7 @@ var PlayScene = (function (_super) { ...@@ -13039,7 +13039,7 @@ var PlayScene = (function (_super) {
this.targetScoreTxt = this.addChild(new FYGE.BitmapText(commonTextArr)); this.targetScoreTxt = this.addChild(new FYGE.BitmapText(commonTextArr));
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);
}; };
PlayScene.prototype.start = function (data) { PlayScene.prototype.start = function (data) {
var _this = this; var _this = this;
...@@ -13103,12 +13103,12 @@ var PlayScene = (function (_super) { ...@@ -13103,12 +13103,12 @@ var PlayScene = (function (_super) {
["第", "关"].forEach(function (e) { chapterTex[e] = RES_1.RES.getRes("chapterNum" + e + ".png"); }); ["第", "关"].forEach(function (e) { chapterTex[e] = RES_1.RES.getRes("chapterNum" + e + ".png"); });
var chapterTxt = this.addChild(new FYGE.BitmapText(chapterTex)); var 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_1.Tools.getNumTextures("stepNum"))); this.stepNumber = this.addChild(new FYGE.BitmapText(Tools_1.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_1.ScoreProgress(this.chapterData.starScores)); this.scoreProgress = this.addChild(new ScoreProgress_1.ScoreProgress(this.chapterData.starScores));
this.scoreProgress.position.set(94, 221); this.scoreProgress.position.set(94, 271);
this.score = 0; this.score = 0;
var path = aaa_1.generateMapBg(this.chapterData.map.lattices); var path = aaa_1.generateMapBg(this.chapterData.map.lattices);
var bg = aaa_1.drawBg(path, this.chapterData.map.lattices); var bg = aaa_1.drawBg(path, this.chapterData.map.lattices);
...@@ -13145,7 +13145,7 @@ var PlayScene = (function (_super) { ...@@ -13145,7 +13145,7 @@ var PlayScene = (function (_super) {
} }
this.elementTargets = new ElementTargets_1.ElementTargets(this.passElements); this.elementTargets = new ElementTargets_1.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;
} }
This diff is collapsed.
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