Skip to content

B
babycare_xiaoxiao
Commit c56a84f9 authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

effect

parent e08223a5
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 13 deletions
.idea/workspace.xml
View file @ c56a84f9
......@@ -2,7 +2,10 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="9cef0552-af3c-4a1c-be1f-dc41ebe5b6db" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/src/scene/map/MapUI.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapUI.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/babycare.getIndex.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/babycare.getIndex.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapMid.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapMid.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" />
......@@ -101,7 +104,7 @@
<workItem from="1594111755267" duration="29551000" />
<workItem from="1594260676967" duration="30060000" />
<workItem from="1594604662575" duration="27200000" />
<workItem from="1594691193000" duration="10644000" />
<workItem from="1594691193000" duration="14390000" />
</task>
<task id="LOCAL-00001" summary="111">
<created>1594122339119</created>
......@@ -187,7 +190,14 @@
<option name="project" value="LOCAL" />
<updated>1594707238031</updated>
</task>
<option name="localTasksCounter" value="13" />
<task id="LOCAL-00013" summary="effect">
<created>1594707268299</created>
<option name="number" value="00013" />
<option name="presentableId" value="LOCAL-00013" />
<option name="project" value="LOCAL" />
<updated>1594707268299</updated>
</task>
<option name="localTasksCounter" value="14" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -212,10 +222,10 @@
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="251" y="471" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/31.23.1889.1177@31.23.1889.1177" timestamp="1594113080922" />
<state x="754" y="183" key="CommitChangelistDialog2" timestamp="1594707237792">
<state x="754" y="183" key="CommitChangelistDialog2" timestamp="1594707268124">
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="754" y="183" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1594707237792" />
<state x="754" y="183" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1594707268124" />
<state width="882" height="329" key="GridCell.Tab.0.bottom" timestamp="1594693733806">
<screen x="31" y="23" width="1889" height="1177" />
</state>
......@@ -240,10 +250,10 @@
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="31" y="250" key="SettingsEditor/31.23.1889.1177@31.23.1889.1177" timestamp="1594195630991" />
<state x="92" y="351" key="Vcs.Push.Dialog.v2" timestamp="1594698382173">
<state x="92" y="351" key="Vcs.Push.Dialog.v2" timestamp="1594707270619">
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="92" y="351" key="Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177" timestamp="1594698382173" />
<state x="92" y="351" key="Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177" timestamp="1594707270619" />
<state x="87" y="216" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1594705166397">
<screen x="31" y="23" width="1889" height="1177" />
</state>
......@@ -268,9 +278,9 @@
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="157" y="286" key="run.anything.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1594188122355" />
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup" timestamp="1594706884230">
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup" timestamp="1594707473466">
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1594706884230" />
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1594707473466" />
</component>
</project>
\ No newline at end of file
mock/miniTb/babycare.getIndex.json
View file @ c56a84f9
......@@ -4,7 +4,7 @@
"message": "OK",
"data": {
"power": 100,
"currentLevel": 120,
"currentLevel": 1,
"tools": {
"STEPS": 1,
"BOOMS": 2,
......
src/scene/map/MapMid.ts
View file @ c56a84f9
......@@ -51,8 +51,8 @@ export default class MapMid extends MapPart {
// 热气球
this.balloon = this.addChild(Tools.getSprite('map_狐狸气球.png', -216, 750));
Tween.get(this.balloon, {loop: true})
.set({x: -216, y: 1150})
.to({x: 750 + 100, y: 837}, 20006);
.set({x: -216, y: 1170})
.to({x: 750 + 100, y: 765}, 20006);
this.balloon.mouseEnable = this.balloon.mouseChildren = false;
// 流水
......
src/scene/map/MapScene.ts
View file @ c56a84f9
......@@ -8,6 +8,8 @@ import { layers } from "../../../module/views/layers";
import { sendTbNet, TbNetName } from "../../TaoBaoNet";
import ScrollPage = FYGE.ScrollPage;
import Container = FYGE.Container;
import { Tools } from "../../Tools";
import Graphics = FYGE.Graphics;
export class MapScene extends Scene {
private mapContainer: Container = null;
......@@ -22,6 +24,8 @@ export class MapScene extends Scene {
private uiLayer: MapUI = null;
private mapAvatar: MapAvatar = null;
public get groupNames(): string[] {
return [
'map',
......@@ -61,9 +65,12 @@ export class MapScene extends Scene {
}
// 当前关卡
if (currentLevel < 121) {
if (currentLevel < 121 && currentLevel > 0) {
MapScene.checkArr[currentLevel].type = CHECK_TYPE.CUR;
MapScene.checkArr[currentLevel].enabled = true;
!this.mapAvatar && (this.mapAvatar = this.addChild(new MapAvatar()));
this.mapAvatar.parent && this.mapAvatar.parent.removeChild(this.mapAvatar);
MapScene.checkArr[currentLevel].addChild(this.mapAvatar);
}
// 未通关的
......@@ -72,6 +79,7 @@ export class MapScene extends Scene {
MapScene.checkArr[i].enabled = false;
}
// 闯关记录里有的
res.data.visitors.forEach((v) => {
MapScene.checkArr[v.level].data = v;
});
......@@ -150,3 +158,26 @@ export class MapScene extends Scene {
super.removeEvents();
}
}
/**
* 地图上的头像
*/
export class MapAvatar extends Container {
constructor() {
super();
this.addChild(Tools.getSprite('map_avatar_bg.png'))
.anchorTexture.set(0.5, 1);
this.position.set(54, 28);
this.mouseChildren = this.mouseEnable = false;
const mask = this.addChild(new Graphics());
mask.drawCircle(0, -58, 38);
/// TODO 加头像
}
}
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