Skip to content

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

111

parent 08995a53
Hide whitespace changes
Inline Side-by-side
Showing with 293 additions and 29 deletions
.idea/workspace.xml
View file @ fa582933
...@@ -2,23 +2,20 @@ ...@@ -2,23 +2,20 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="9cef0552-af3c-4a1c-be1f-dc41ebe5b6db" name="Default Changelist" comment=""> <list default="true" id="9cef0552-af3c-4a1c-be1f-dc41ebe5b6db" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/resource/map/map_avatar_bg.png" afterDir="false" /> <change afterPath="$PROJECT_DIR$/resource/map/map_prizeBox.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_bg1.jpg" afterDir="false" /> <change afterPath="$PROJECT_DIR$/resource/map/map_taskBtn.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_bg2.jpg" afterDir="false" /> <change afterPath="$PROJECT_DIR$/resource/map/map_推车.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_bg3.jpg" afterDir="false" /> <change afterPath="$PROJECT_DIR$/resource/map/map_狐狸气球.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check_disable.png" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/scene/map/MapBottom.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check_disable_prize.png" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/scene/map/MapMid.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check_enable.png" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/scene/map/MapTop.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check_enable_cur.png" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/scene/map/MapUI.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_prizeBtn.png" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_ruleBtn.png" afterDir="false" /> <change beforePath="$PROJECT_DIR$/resource/map/map_bg2.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_bg2.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_star_disable.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_star_enable.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/scene/MapScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/res.json" beforeDir="false" afterPath="$PROJECT_DIR$/resource/res.json" afterDir="false" /> <change beforePath="$PROJECT_DIR$/resource/res.json" beforeDir="false" afterPath="$PROJECT_DIR$/resource/res.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Main.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/Main.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Main.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/Main.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ResJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ResJson.ts" 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/MapScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapScene.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" />
...@@ -36,6 +33,9 @@ ...@@ -36,6 +33,9 @@
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component> </component>
<component name="ProjectId" id="1eLguwUxaFZQKdDU4ke9UiiRNrt" /> <component name="ProjectId" id="1eLguwUxaFZQKdDU4ke9UiiRNrt" />
<component name="ProjectLevelVcsManager">
<ConfirmationsSetting value="2" id="Add" />
</component>
<component name="ProjectViewState"> <component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" /> <option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
...@@ -44,22 +44,27 @@ ...@@ -44,22 +44,27 @@
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" /> <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" /> <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/resource" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/resource/map" />
<property name="node.js.detected.package.tslint" value="true" /> <property name="node.js.detected.package.tslint" value="true" />
<property name="node.js.path.for.package.tslint" value="project" /> <property name="node.js.path.for.package.tslint" value="project" />
<property name="node.js.selected.package.tslint" value="(autodetect)" /> <property name="node.js.selected.package.tslint" value="(autodetect)" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" /> <property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="nodejs_package_manager_path" value="npm" /> <property name="nodejs_package_manager_path" value="npm" />
<property name="run.code.analysis.last.selected.profile" value="pProject Default" />
<property name="settings.editor.selected.configurable" value="editor.preferences.fonts.default" /> <property name="settings.editor.selected.configurable" value="editor.preferences.fonts.default" />
<property name="ts.external.directory.path" value="$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external" /> <property name="ts.external.directory.path" value="$PROJECT_DIR$/node_modules/typescript/lib" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/resource/map" />
<recent name="$PROJECT_DIR$/resource" /> <recent name="$PROJECT_DIR$/resource" />
</key> </key>
<key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/src/scene/map" />
</key>
</component> </component>
<component name="RunManager" selected="npm.flushRes"> <component name="RunManager" selected="npm.dev">
<configuration name="dev" type="js.build_tools.npm" temporary="true" nameIsGenerated="true"> <configuration name="dev" 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" />
...@@ -97,7 +102,8 @@ ...@@ -97,7 +102,8 @@
<option name="number" value="Default" /> <option name="number" value="Default" />
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1594106513515</updated> <updated>1594106513515</updated>
<workItem from="1594106517562" duration="2416000" /> <workItem from="1594106517562" duration="5224000" />
<workItem from="1594111755267" duration="4329000" />
</task> </task>
<servers /> <servers />
</component> </component>
...@@ -109,22 +115,38 @@ ...@@ -109,22 +115,38 @@
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="440" y="273" key="#com.intellij.execution.impl.EditConfigurationsDialog/31.23.1889.1177@31.23.1889.1177" timestamp="1594106579644" /> <state x="440" y="273" key="#com.intellij.execution.impl.EditConfigurationsDialog/31.23.1889.1177@31.23.1889.1177" timestamp="1594106579644" />
<state width="896" height="330" key="GridCell.Tab.0.bottom" timestamp="1594107808454"> <state x="251" y="471" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1" timestamp="1594113080922">
<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="58" y="183" key="CommitChangelistDialog2" timestamp="1594111761557">
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="58" y="183" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1594111761557" />
<state width="896" height="329" key="GridCell.Tab.0.bottom" timestamp="1594114672377">
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state width="896" height="329" key="GridCell.Tab.0.bottom/31.23.1889.1177@31.23.1889.1177" timestamp="1594114672377" />
<state width="896" height="329" key="GridCell.Tab.0.center" timestamp="1594114672377">
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state width="896" height="329" key="GridCell.Tab.0.center/31.23.1889.1177@31.23.1889.1177" timestamp="1594114672377" />
<state width="896" height="329" key="GridCell.Tab.0.left" timestamp="1594114672376">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state width="896" height="330" key="GridCell.Tab.0.bottom/31.23.1889.1177@31.23.1889.1177" timestamp="1594107808454" /> <state width="896" height="329" key="GridCell.Tab.0.left/31.23.1889.1177@31.23.1889.1177" timestamp="1594114672376" />
<state width="896" height="330" key="GridCell.Tab.0.center" timestamp="1594107808453"> <state width="896" height="329" key="GridCell.Tab.0.right" timestamp="1594114672377">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state width="896" height="330" key="GridCell.Tab.0.center/31.23.1889.1177@31.23.1889.1177" timestamp="1594107808453" /> <state width="896" height="329" key="GridCell.Tab.0.right/31.23.1889.1177@31.23.1889.1177" timestamp="1594114672377" />
<state width="896" height="330" key="GridCell.Tab.0.left" timestamp="1594107808453"> <state x="210" y="320" key="RollbackChangesDialog" timestamp="1594111737150">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state width="896" height="330" key="GridCell.Tab.0.left/31.23.1889.1177@31.23.1889.1177" timestamp="1594107808453" /> <state x="210" y="320" key="RollbackChangesDialog/31.23.1889.1177@31.23.1889.1177" timestamp="1594111737150" />
<state width="896" height="330" key="GridCell.Tab.0.right" timestamp="1594107808454"> <state x="87" y="216" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1594111906161">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state width="896" height="330" key="GridCell.Tab.0.right/31.23.1889.1177@31.23.1889.1177" timestamp="1594107808454" /> <state x="87" y="216" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/31.23.1889.1177@31.23.1889.1177" timestamp="1594111906161" />
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup" timestamp="1594107828315"> <state x="640" y="288" width="670" height="676" key="search.everywhere.popup" timestamp="1594107828315">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
......
resource/res.json
View file @ fa582933
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
"name": "common" "name": "common"
}, },
{ {
"keys": "map_avatar_bg.png,map_bg1.jpg,map_bg2.jpg,map_bg3.jpg,map_check_disable.png,map_check_disable_prize.png,map_check_enable.png,map_check_enable_cur.png,map_prizeBtn.png,map_ruleBtn.png,map_star_disable.png,map_star_enable.png", "keys": "map_avatar_bg.png,map_bg1.jpg,map_bg2.jpg,map_bg3.jpg,map_check_disable.png,map_check_disable_prize.png,map_check_enable.png,map_check_enable_cur.png,map_prizeBox.png,map_prizeBtn.png,map_ruleBtn.png,map_star_disable.png,map_star_enable.png,map_taskBtn.png,map_推车.png,map_狐狸气球.png",
"name": "map" "name": "map"
} }
], ],
......
src/Main.ts
View file @ fa582933
...@@ -9,7 +9,7 @@ import { ResJson } from "./ResJson"; ...@@ -9,7 +9,7 @@ import { ResJson } from "./ResJson";
import { destroyNetData, sendTbNet, TbNetName } from "./TaoBaoNet"; import { destroyNetData, sendTbNet, TbNetName } from "./TaoBaoNet";
import { SkinJson } from "./SkinJson"; import { SkinJson } from "./SkinJson";
import { G_EVENT } from "./common/G_EVENT"; import { G_EVENT } from "./common/G_EVENT";
import { MapScene } from "./scene/MapScene"; import { MapScene } from "./scene/map/MapScene";
/** /**
* 全局事件，为了和小程序交互 * 全局事件，为了和小程序交互
......
src/ResJson.ts
View file @ fa582933
...@@ -65,7 +65,7 @@ export const ResJson = { ...@@ -65,7 +65,7 @@ export const ResJson = {
"name": "common" "name": "common"
}, },
{ {
"keys": "map_avatar_bg.png,map_bg1.jpg,map_bg2.jpg,map_bg3.jpg,map_check_disable.png,map_check_disable_prize.png,map_check_enable.png,map_check_enable_cur.png,map_prizeBtn.png,map_ruleBtn.png,map_star_disable.png,map_star_enable.png", "keys": "map_avatar_bg.png,map_bg1.jpg,map_bg2.jpg,map_bg3.jpg,map_check_disable.png,map_check_disable_prize.png,map_check_enable.png,map_check_enable_cur.png,map_prizeBox.png,map_prizeBtn.png,map_ruleBtn.png,map_star_disable.png,map_star_enable.png,map_taskBtn.png,map_推车.png,map_狐狸气球.png",
"name": "map" "name": "map"
} }
], ],
......
src/scene/map/MapBottom.ts 0 → 100644
View file @ fa582933
import { Module } from "../../../module/views/Module";
import { Tool } from "../../Tools";
import Sprite = FYGE.Sprite;
export class MapBottom extends Module {
private bg: Sprite = null;
public get width() {
return 750;
}
public get height() {
return 1093;
}
protected initUi() {
super.initUi();
this.bg = this.addChild(Tool.getSprite('map_bg1.jpg'));
}
public start(data?: any) {
super.start(data);
}
public initEvents() {
super.initEvents();
}
public removeEvents() {
super.removeEvents();
}
public destroy() {
super.destroy();
}
}
src/scene/map/MapMid.ts 0 → 100644
View file @ fa582933
import { Module } from "../../../module/views/Module";
import { Tool } from "../../Tools";
import Sprite = FYGE.Sprite;
export class MapMid extends Module {
private bg: Sprite = null;
public get width() {
return 750;
}
public get height() {
return 1635;
}
protected initUi() {
super.initUi();
this.bg = this.addChild(Tool.getSprite('map_bg2.jpg'));
}
public start(data?: any) {
super.start(data);
}
public initEvents() {
super.initEvents();
}
public removeEvents() {
super.removeEvents();
}
public destroy() {
super.destroy();
}
}
src/scene/MapScene.ts → src/scene/map/MapScene.ts
View file @ fa582933
import { Scene } from "../../module/views/Scene"; import { Scene } from "../../../module/views/Scene";
import ScrollPage = FYGE.ScrollPage; import ScrollPage = FYGE.ScrollPage;
import Container = FYGE.Container; import Container = FYGE.Container;
import { Tool } from "../Tools"; import { Tool } from "../../Tools";
import { MapTop } from "./MapTop";
import { MapMid } from "./MapMid";
import { MapBottom } from "./MapBottom";
import { MapUI } from "./MapUI";
export class MapScene extends Scene { export class MapScene extends Scene {
private mapContainer: Container = null; private mapContainer: Container = null;
private scrollPage: ScrollPage = null; private scrollPage: ScrollPage = null;
private uiLayer: Container = null;
public get groupNames(): string[] { public get groupNames(): string[] {
return ['map']; return ['map'];
} }
...@@ -17,12 +23,23 @@ export class MapScene extends Scene { ...@@ -17,12 +23,23 @@ export class MapScene extends Scene {
this.scrollPage = this.addChild(new ScrollPage(750, 1624, 888, true, true)); this.scrollPage = this.addChild(new ScrollPage(750, 1624, 888, true, true));
this.mapContainer = this.scrollPage.view.addChild(new Container()); this.mapContainer = this.scrollPage.view.addChild(new Container());
let bg3 = this.mapContainer.addChild(Tool.getSprite('map_bg3.jpg')); let mapHeight = 0;
let bg2 = this.mapContainer.addChild(Tool.getSprite('map_bg2.jpg', 0, bg3.height)); let bg3 = this.mapContainer.addChild(new MapTop());
let bg1 = this.mapContainer.addChild(Tool.getSprite('map_bg1.jpg', 0, bg3.height + bg2.height)); bg3.y = 0;
mapHeight += bg3.height;
let bg2 = this.mapContainer.addChild(new MapMid());
bg2.y = bg3.height;
mapHeight += bg2.height;
let bg1 = this.mapContainer.addChild(new MapBottom());
bg1.y = bg2.height + bg3.height;
mapHeight += bg1.height;
this.scrollPage.maxDistance = mapHeight;
this.scrollPage.scrollTo(mapHeight, 0);
this.scrollPage.maxDistance = this.mapContainer.height; this.uiLayer = this.addChild(new MapUI());
this.scrollPage.scrollTo(this.mapContainer.height, 0);
} }
public start(data?: any) { public start(data?: any) {
......
src/scene/map/MapTop.ts 0 → 100644
View file @ fa582933
import { Tool } from "../../Tools";
import { Module } from "../../../module/views/Module";
import Sprite = FYGE.Sprite;
export class MapTop extends Module {
private bg: Sprite = null;
public get width() {
return 750;
}
public get height() {
return 521;
}
protected initUi() {
super.initUi();
this.bg = this.addChild(Tool.getSprite('map_bg3.jpg'));
}
public start(data?: any) {
super.start(data);
}
public initEvents() {
super.initEvents();
}
public removeEvents() {
super.removeEvents();
}
public destroy() {
super.destroy();
}
}
src/scene/map/MapUI.ts 0 → 100644
View file @ fa582933
import Container = FYGE.Container;
import Button = FYGE.Button;
import TextField = FYGE.TextField;
import TEXT_ALIGN = FYGE.TEXT_ALIGN;
import { RES } from "../../../module/RES";
import { Tool } from "../../Tools";
export class MapUI extends Container {
private myPrizeBtn: Button = null;
private ruleBtn: Button = null;
private taskBtn: Button = null;
private prizeBox: Container = null;
constructor() {
super();
this.initUi();
}
private initUi() {
// 我的奖品
this.myPrizeBtn = this.addChild(new Button(RES.getRes('map_prizeBtn.png')));
this.myPrizeBtn.position.set(0, 185);
this.myPrizeBtn.anchorX = 0;
// 规则按钮
this.ruleBtn = this.addChild(new Button(RES.getRes('map_ruleBtn.png')));
this.ruleBtn.position.set(0, 104);
this.ruleBtn.anchorX = 0;
// 任务按钮
this.taskBtn = this.addChild(new Button(RES.getRes('map_taskBtn.png')));
this.taskBtn.position.set(19, 280);
this.prizeBox = this.addChild(new PrizeBox());
}
}
class PrizeBox extends Container {
private checkTip: TextField = null;
private tip: TextField = null;
constructor() {
super();
this.position.set(558, 269);
this.addChild(Tool.getSprite('map_prizeBox.png'));
this.checkTip = this.addChild(Tool.getText(
'再闯XXX关', 22,
'#ffffff', TEXT_ALIGN.CENTER,
158, 0, 64
));
this.tip = this.addChild(Tool.getText(
'参与红包抽奖\n赢XXX优惠券', 17,
'#ec5a5a', TEXT_ALIGN.CENTER,
158, 0, 112
));
this.tip.lineSpacing = 0;
}
}
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