Skip to content

B
babycare_xiaoxiao
Commit 565390a6 authored by wjf's avatar wjf
Browse files
Options

l

parents 1d18eacb 97dd51fd
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 46 deletions
.idea/workspace.xml
View file @ 565390a6
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<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="111"> <list default="true" id="9cef0552-af3c-4a1c-be1f-dc41ebe5b6db" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/mock/miniTb/babycare.getIndex.json" 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$/module/views/layers.ts" beforeDir="false" afterPath="$PROJECT_DIR$/module/views/layers.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/common/ProgressBar.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/common/ProgressBar.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TaoBaoNet.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/TaoBaoNet.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/common/ProgressBarS.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/common/ProgressBarS.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/CheckBtn.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/CheckBtn.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/scene/map/CheckBtn.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/CheckBtn.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapBottom.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapBottom.ts" 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/MapPart.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapPart.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapTop.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapTop.ts" afterDir="false" />
<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$/src/scene/map/MapUI.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapUI.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/something/states/BubbleState.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/states/BubbleState.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/something/states/HairballBlackState.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/states/HairballBlackState.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/something/states/HairballBrownState.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/states/HairballBrownState.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/something/states/LockState.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/states/LockState.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" />
...@@ -102,7 +100,7 @@ ...@@ -102,7 +100,7 @@
<updated>1594106513515</updated> <updated>1594106513515</updated>
<workItem from="1594106517562" duration="5224000" /> <workItem from="1594106517562" duration="5224000" />
<workItem from="1594111755267" duration="29551000" /> <workItem from="1594111755267" duration="29551000" />
<workItem from="1594260676967" duration="14401000" /> <workItem from="1594260676967" duration="14897000" />
</task> </task>
<task id="LOCAL-00001" summary="111"> <task id="LOCAL-00001" summary="111">
<created>1594122339119</created> <created>1594122339119</created>
...@@ -118,7 +116,14 @@ ...@@ -118,7 +116,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1594213388301</updated> <updated>1594213388301</updated>
</task> </task>
<option name="localTasksCounter" value="3" /> <task id="LOCAL-00003" summary="111">
<created>1594279815824</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1594279815824</updated>
</task>
<option name="localTasksCounter" value="4" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -137,26 +142,26 @@ ...@@ -137,26 +142,26 @@
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </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="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="1594277421161"> <state x="58" y="183" key="CommitChangelistDialog2" timestamp="1594279815598">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="58" y="183" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1594277421161" /> <state x="58" y="183" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1594279815598" />
<state width="879" height="329" key="GridCell.Tab.0.bottom" timestamp="1594261592327"> <state width="879" height="329" key="GridCell.Tab.0.bottom" timestamp="1594280192037">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state width="879" height="329" key="GridCell.Tab.0.bottom/31.23.1889.1177@31.23.1889.1177" timestamp="1594261592327" /> <state width="879" height="329" key="GridCell.Tab.0.bottom/31.23.1889.1177@31.23.1889.1177" timestamp="1594280192037" />
<state width="879" height="329" key="GridCell.Tab.0.center" timestamp="1594261592326"> <state width="879" height="329" key="GridCell.Tab.0.center" timestamp="1594280192036">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state width="879" height="329" key="GridCell.Tab.0.center/31.23.1889.1177@31.23.1889.1177" timestamp="1594261592326" /> <state width="879" height="329" key="GridCell.Tab.0.center/31.23.1889.1177@31.23.1889.1177" timestamp="1594280192036" />
<state width="879" height="329" key="GridCell.Tab.0.left" timestamp="1594261592326"> <state width="879" height="329" key="GridCell.Tab.0.left" timestamp="1594280192034">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state width="879" height="329" key="GridCell.Tab.0.left/31.23.1889.1177@31.23.1889.1177" timestamp="1594261592326" /> <state width="879" height="329" key="GridCell.Tab.0.left/31.23.1889.1177@31.23.1889.1177" timestamp="1594280192034" />
<state width="879" height="329" key="GridCell.Tab.0.right" timestamp="1594261592326"> <state width="879" height="329" key="GridCell.Tab.0.right" timestamp="1594280192036">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state width="879" height="329" key="GridCell.Tab.0.right/31.23.1889.1177@31.23.1889.1177" timestamp="1594261592326" /> <state width="879" height="329" key="GridCell.Tab.0.right/31.23.1889.1177@31.23.1889.1177" timestamp="1594280192036" />
<state x="210" y="320" key="RollbackChangesDialog" timestamp="1594173186663"> <state x="210" y="320" key="RollbackChangesDialog" timestamp="1594173186663">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
...@@ -165,10 +170,10 @@ ...@@ -165,10 +170,10 @@
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="31" y="250" key="SettingsEditor/31.23.1889.1177@31.23.1889.1177" timestamp="1594195630991" /> <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="1594213389525"> <state x="92" y="351" key="Vcs.Push.Dialog.v2" timestamp="1594279817233">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="92" y="351" key="Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177" timestamp="1594213389525" /> <state x="92" y="351" key="Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177" timestamp="1594279817233" />
<state x="87" y="216" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1594111906161"> <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>
...@@ -177,9 +182,9 @@ ...@@ -177,9 +182,9 @@
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="157" y="286" key="run.anything.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1594188122355" /> <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="1594279600705"> <state x="640" y="288" width="670" height="676" key="search.everywhere.popup" timestamp="1594279909133">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1594279600705" /> <state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1594279909133" />
</component> </component>
</project> </project>
\ No newline at end of file
src/common/ProgressBar.ts
View file @ 565390a6
import { Tool } from "../Tools"; import { Tools } from "../Tools";
import { RES } from "../../module/RES"; import { RES } from "../../module/RES";
...@@ -22,7 +22,7 @@ export class ProgressBar extends FYGE.Container { ...@@ -22,7 +22,7 @@ export class ProgressBar extends FYGE.Container {
.drawRoundedRect(0, 0, this.value * this.maxLength, 19, 10) .drawRoundedRect(0, 0, this.value * this.maxLength, 19, 10)
.endFill(); .endFill();
this.progressTxt = this.addChild(Tool.getText( this.progressTxt = this.addChild(Tools.getText(
"0%", "0%",
22, 22,
"#f8c862", "#f8c862",
...@@ -47,4 +47,4 @@ export class ProgressBar extends FYGE.Container { ...@@ -47,4 +47,4 @@ export class ProgressBar extends FYGE.Container {
.drawRoundedRect(0, 0, length, 19, 10) .drawRoundedRect(0, 0, length, 19, 10)
.endFill(); .endFill();
} }
} }
\ No newline at end of file
src/common/ProgressBarS.ts
View file @ 565390a6
import { Tool } from "../Tools"; import { Tools } from "../Tools";
import { RES } from "../../module/RES"; import { RES } from "../../module/RES";
...@@ -43,4 +43,4 @@ export class ProgressBarS { ...@@ -43,4 +43,4 @@ export class ProgressBarS {
this.progressTxt.text = ((v * 100) >> 0) + "%"; this.progressTxt.text = ((v * 100) >> 0) + "%";
this.upImage.x = this.oriX - (1 - this._value) * this.maxLength this.upImage.x = this.oriX - (1 - this._value) * this.maxLength
} }
} }
\ No newline at end of file
src/scene/map/CheckBtn.ts
View file @ 565390a6
...@@ -4,7 +4,7 @@ import Container = FYGE.Container; ...@@ -4,7 +4,7 @@ import Container = FYGE.Container;
import Sprite = FYGE.Sprite; import Sprite = FYGE.Sprite;
import Texture = FYGE.Texture; import Texture = FYGE.Texture;
import TextField = FYGE.TextField; import TextField = FYGE.TextField;
import { Tool } from "../../Tools"; import { Tools } from "../../Tools";
import TEXT_ALIGN = FYGE.TEXT_ALIGN; import TEXT_ALIGN = FYGE.TEXT_ALIGN;
import MouseEvent = FYGE.MouseEvent; import MouseEvent = FYGE.MouseEvent;
import Point = FYGE.Point; import Point = FYGE.Point;
...@@ -120,7 +120,7 @@ export default class CheckBtn extends Container { ...@@ -120,7 +120,7 @@ export default class CheckBtn extends Container {
this.star = [star1, star2, star3]; this.star = [star1, star2, star3];
this.checkNum = data.check; this.checkNum = data.check;
this.checkLabel = this.btn.addChild(Tool.getText( this.checkLabel = this.btn.addChild(Tools.getText(
data.check, 30, '#ffffff', data.check, 30, '#ffffff',
TEXT_ALIGN.CENTER, 90, 8, 33 TEXT_ALIGN.CENTER, 90, 8, 33
)); ));
......
src/scene/map/MapUI.ts
View file @ 565390a6
...@@ -4,7 +4,7 @@ import TextField = FYGE.TextField; ...@@ -4,7 +4,7 @@ import TextField = FYGE.TextField;
import Sprite = FYGE.Sprite; import Sprite = FYGE.Sprite;
import TEXT_ALIGN = FYGE.TEXT_ALIGN; import TEXT_ALIGN = FYGE.TEXT_ALIGN;
import { RES } from "../../../module/RES"; import { RES } from "../../../module/RES";
import { Tool } from "../../Tools"; import { Tools } from "../../Tools";
import MouseEvent = FYGE.MouseEvent; import MouseEvent = FYGE.MouseEvent;
export default class MapUI extends Container { export default class MapUI extends Container {
...@@ -111,11 +111,11 @@ class EnergyBox extends Container { ...@@ -111,11 +111,11 @@ class EnergyBox extends Container {
private initUi(data) { private initUi(data) {
this.position.set(544, 105); this.position.set(544, 105);
this.addChild(Tool.getSprite('map_energyBg.png')); this.addChild(Tools.getSprite('map_energyBg.png'));
this.addBtn = this.addChild(new Button(RES.getRes('map_energyAdd.png'))); this.addBtn = this.addChild(new Button(RES.getRes('map_energyAdd.png')));
this.addBtn.position.set(135, 14); this.addBtn.position.set(135, 14);
this.countLabel = this.addChild(Tool.getText( this.countLabel = this.addChild(Tools.getText(
'0', 20, '#ffffff', '0', 20, '#ffffff',
TEXT_ALIGN.CENTER, 80, 54, 21 TEXT_ALIGN.CENTER, 80, 54, 21
)); ));
...@@ -150,9 +150,9 @@ class CreditsBox extends Container { ...@@ -150,9 +150,9 @@ class CreditsBox extends Container {
private initUi(data) { private initUi(data) {
this.position.set(544, 184); this.position.set(544, 184);
this.addChild(Tool.getSprite('map_creditsBg.png')); this.addChild(Tools.getSprite('map_creditsBg.png'));
this.countLabel = this.addChild(Tool.getText( this.countLabel = this.addChild(Tools.getText(
'积分:0', 20, '#ffffff', '积分:0', 20, '#ffffff',
TEXT_ALIGN.CENTER, 105, 58, 21 TEXT_ALIGN.CENTER, 105, 58, 21
)); ));
...@@ -179,20 +179,20 @@ class PrizeBox extends Button { ...@@ -179,20 +179,20 @@ class PrizeBox extends Button {
private initUi(data) { private initUi(data) {
this.position.set(558, 269); this.position.set(558, 269);
this.checkTip = this.addChild(Tool.getText( this.checkTip = this.addChild(Tools.getText(
'再闯XXX关', 22, '再闯XXX关', 22,
'#ffffff', TEXT_ALIGN.CENTER, '#ffffff', TEXT_ALIGN.CENTER,
158, 0, 64 158, 0, 64
)); ));
this.tip = this.addChild(Tool.getText( this.tip = this.addChild(Tools.getText(
'参与红包抽奖\n赢XXX优惠券', 17, '参与红包抽奖\n赢XXX优惠券', 17,
'#ec5a5a', TEXT_ALIGN.CENTER, '#ec5a5a', TEXT_ALIGN.CENTER,
158, 0, 112 158, 0, 112
)); ));
this.tip.lineSpacing = 0; this.tip.lineSpacing = 0;
this.prizeImg = this.addChild(Tool.getSprite('map_star_enable.png', 39, 150)); this.prizeImg = this.addChild(Tools.getSprite('map_star_enable.png', 39, 150));
this.prizeImg.width = 80; this.prizeImg.width = 80;
this.prizeImg.height = 33; this.prizeImg.height = 33;
} }
......
src/something/states/BubbleState.ts
View file @ 565390a6
...@@ -39,4 +39,4 @@ export class BubbleState extends State { ...@@ -39,4 +39,4 @@ export class BubbleState extends State {
this.showImage.x = -texture.width / 2; this.showImage.x = -texture.width / 2;
this.showImage.y = -texture.height / 2 this.showImage.y = -texture.height / 2
} }
} }
\ No newline at end of file
src/something/states/HairballBlackState.ts
View file @ 565390a6
...@@ -46,4 +46,4 @@ export class HairballBlackState extends State { ...@@ -46,4 +46,4 @@ export class HairballBlackState extends State {
this.showImage.x = -texture.width / 2; this.showImage.x = -texture.width / 2;
this.showImage.y = -texture.height / 2 this.showImage.y = -texture.height / 2
} }
} }
\ No newline at end of file
src/something/states/HairballBrownState.ts
View file @ 565390a6
import { State } from "../class/State"; import { State } from "../class/State";
import { Pool } from "../Pool"; import { Pool } from "../Pool";
import { RecoverName } from "../enum/RecoverName"; import { RecoverName } from "../enum/RecoverName";
...@@ -39,4 +38,4 @@ export class HairballBrownState extends State { ...@@ -39,4 +38,4 @@ export class HairballBrownState extends State {
this.showImage.x = -texture.width / 2; this.showImage.x = -texture.width / 2;
this.showImage.y = -texture.height / 2 this.showImage.y = -texture.height / 2
} }
} }
\ No newline at end of file
src/something/states/LockState.ts
View file @ 565390a6
import { State } from "../class/State"; import { State } from "../class/State";
import { Pool } from "../Pool"; import { Pool } from "../Pool";
import { RecoverName } from "../enum/RecoverName"; import { RecoverName } from "../enum/RecoverName";
...@@ -113,4 +112,4 @@ export class LockState extends State { ...@@ -113,4 +112,4 @@ export class LockState extends State {
// }) // })
// }) // })
// } // }
// } // }
\ No newline at end of file
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