Commit 49ac6aeb authored by 邱旭's avatar 邱旭

换了点皮

parent f6f03468
......@@ -3,14 +3,9 @@
<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/mine.getAppData.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/mine.getAppData.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$/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/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/scene/PlayScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/PlayScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapScene.ts" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -103,7 +98,7 @@
<recent name="$PROJECT_DIR$/lotties" />
</key>
</component>
<component name="RunManager" selected="npm.build">
<component name="RunManager" selected="npm.buildTS">
<configuration name="build" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
<package-json value="$PROJECT_DIR$/package.json" />
<command value="run" />
......@@ -163,11 +158,11 @@
</list>
<recent_temporary>
<list>
<item itemvalue="npm.buildTS" />
<item itemvalue="npm.build" />
<item itemvalue="npm.flushRes" />
<item itemvalue="npm.dev" />
<item itemvalue="npm.handleLotS" />
<item itemvalue="npm.buildTS" />
</list>
</recent_temporary>
</component>
......@@ -204,14 +199,7 @@
<workItem from="1617871191619" duration="121000" />
<workItem from="1617890665920" duration="181000" />
<workItem from="1617960804439" duration="639000" />
<workItem from="1618193237335" duration="17390000" />
</task>
<task id="LOCAL-00045" summary="m">
<created>1614064323435</created>
<option name="number" value="00045" />
<option name="presentableId" value="LOCAL-00045" />
<option name="project" value="LOCAL" />
<updated>1614064323435</updated>
<workItem from="1618193237335" duration="18428000" />
</task>
<task id="LOCAL-00046" summary="m">
<created>1614064727527</created>
......@@ -549,12 +537,29 @@
<option name="project" value="LOCAL" />
<updated>1618213394771</updated>
</task>
<option name="localTasksCounter" value="94" />
<task id="LOCAL-00094" summary="换了点皮">
<created>1618216669162</created>
<option name="number" value="00094" />
<option name="presentableId" value="LOCAL-00094" />
<option name="project" value="LOCAL" />
<updated>1618216669162</updated>
</task>
<option name="localTasksCounter" value="95" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" />
</component>
<component name="Vcs.Log.History.Properties">
<option name="COLUMN_ID_ORDER">
<list>
<option value="Default.Root" />
<option value="Default.Author" />
<option value="Default.Date" />
<option value="Default.Subject" />
</list>
</option>
</component>
<component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" />
......
......@@ -11385,7 +11385,7 @@ var PlayScene = (function (_super) {
this.targetScoreTxt.position.set(118, 283);
this.musicBtn = this.addChild(new MusicBtn());
this.musicBtn.position.set(616, 120);
this.addChild(FYGE.Sprite.fromFrame("闪闪.png")).position.set(288, -layers_1.layers.stageOffsetY + 252);
this.addChild(FYGE.Sprite.fromFrame("闪闪.png")).position.set(288, 252);
};
PlayScene.prototype.start = function (data) {
var _this = this;
......
This diff is collapsed.
......@@ -80,7 +80,8 @@ export class MapScene extends Scene {
}
private initGuide() {
setTimeout(() => this.scrollToCheck(1));
setTimeout(() => this.scrollPage.scrollTo(0, 0));
// setTimeout(() => this.scrollToCheck(1));
const guide = this.addChild(new Container());
const g = guide.addChild(new Graphics());
......@@ -91,7 +92,7 @@ export class MapScene extends Scene {
guide_check.enabled = true;
guide_check.type = CHECK_TYPE.CUR;
const checkY = MapScene.checkArr[1].y - layers.stageOffsetY / layers.stageHeight * 310;
const checkY = MapScene.checkArr[1].y;
guide_check.position.set(MapScene.checkArr[1].x, checkY);
const guide_light = guide.addChild(Tools.getSprite('guide_light.png'));
......
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