Skip to content

Q
qiaqia_qx
Commit 3112aa83 authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

hideEffect

parent c9998dbe
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 14 deletions
.idea/workspace.xml
View file @ 3112aa83
...@@ -3,7 +3,9 @@ ...@@ -3,7 +3,9 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="31be0130-d27d-4740-b668-956a8050e1bf" name="Default Changelist" comment=""> <list default="true" id="31be0130-d27d-4740-b668-956a8050e1bf" name="Default Changelist" 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$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/panels/ExRecordPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/ExRecordPanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/ShopPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/ShopPanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/TaskPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/TaskPanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/WareHousePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/WareHousePanel.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/panels/WareHousePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/WareHousePanel.ts" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -114,7 +116,7 @@ ...@@ -114,7 +116,7 @@
<workItem from="1591321317628" duration="18063000" /> <workItem from="1591321317628" duration="18063000" />
<workItem from="1591438071338" duration="597000" /> <workItem from="1591438071338" duration="597000" />
<workItem from="1591581198126" duration="7855000" /> <workItem from="1591581198126" duration="7855000" />
<workItem from="1591594488054" duration="2684000" /> <workItem from="1591594488054" duration="4754000" />
</task> </task>
<task id="LOCAL-00001" summary="1"> <task id="LOCAL-00001" summary="1">
<created>1591003912929</created> <created>1591003912929</created>
...@@ -221,7 +223,14 @@ ...@@ -221,7 +223,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1591594902967</updated> <updated>1591594902967</updated>
</task> </task>
<option name="localTasksCounter" value="16" /> <task id="LOCAL-00016" summary="wareHouse">
<created>1591597197649</created>
<option name="number" value="00016" />
<option name="presentableId" value="LOCAL-00016" />
<option name="project" value="LOCAL" />
<updated>1591597197649</updated>
</task>
<option name="localTasksCounter" value="17" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -244,12 +253,12 @@ ...@@ -244,12 +253,12 @@
<screen x="37" y="23" width="1643" height="1027" /> <screen x="37" y="23" width="1643" height="1027" />
</state> </state>
<state x="671" y="259" key="#com.intellij.ide.util.MemberChooser/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591344864454" /> <state x="671" y="259" key="#com.intellij.ide.util.MemberChooser/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591344864454" />
<state x="467" y="108" key="CommitChangelistDialog2" timestamp="1591594902601"> <state x="467" y="108" key="CommitChangelistDialog2" timestamp="1591597197357">
<screen x="37" y="23" width="1643" height="1027" /> <screen x="37" y="23" width="1643" height="1027" />
</state> </state>
<state x="466" y="108" key="CommitChangelistDialog2/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591003912498" /> <state x="466" y="108" key="CommitChangelistDialog2/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591003912498" />
<state x="2182" y="-102" key="CommitChangelistDialog2/37.23.1643.1027/1680.-199.1920.1177@1680.-199.1920.1177" timestamp="1591189619717" /> <state x="2182" y="-102" key="CommitChangelistDialog2/37.23.1643.1027/1680.-199.1920.1177@1680.-199.1920.1177" timestamp="1591189619717" />
<state x="467" y="108" key="CommitChangelistDialog2/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591594902601" /> <state x="467" y="108" key="CommitChangelistDialog2/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591597197357" />
<state width="293" height="907" key="GridCell.Tab.0.bottom" timestamp="1591594033795"> <state width="293" height="907" key="GridCell.Tab.0.bottom" timestamp="1591594033795">
<screen x="37" y="23" width="1643" height="1027" /> <screen x="37" y="23" width="1643" height="1027" />
</state> </state>
...@@ -283,11 +292,11 @@ ...@@ -283,11 +292,11 @@
</state> </state>
<state x="614" y="245" key="RollbackChangesDialog/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1590993046653" /> <state x="614" y="245" key="RollbackChangesDialog/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1590993046653" />
<state x="615" y="245" key="RollbackChangesDialog/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591077661188" /> <state x="615" y="245" key="RollbackChangesDialog/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591077661188" />
<state x="457" y="276" key="Vcs.Push.Dialog.v2" timestamp="1591587983810"> <state x="457" y="276" key="Vcs.Push.Dialog.v2" timestamp="1591597198994">
<screen x="37" y="23" width="1643" height="1027" /> <screen x="37" y="23" width="1643" height="1027" />
</state> </state>
<state x="2171" y="91" key="Vcs.Push.Dialog.v2/37.23.1643.1027/1680.-199.1920.1177@1680.-199.1920.1177" timestamp="1591189622538" /> <state x="2171" y="91" key="Vcs.Push.Dialog.v2/37.23.1643.1027/1680.-199.1920.1177@1680.-199.1920.1177" timestamp="1591189622538" />
<state x="457" y="276" key="Vcs.Push.Dialog.v2/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591587983810" /> <state x="457" y="276" key="Vcs.Push.Dialog.v2/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591597198994" />
<state x="417" y="141" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1591269112575"> <state x="417" y="141" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1591269112575">
<screen x="37" y="23" width="1643" height="1027" /> <screen x="37" y="23" width="1643" height="1027" />
</state> </state>
......
src/panels/ExRecordPanel.ts
View file @ 3112aa83
...@@ -67,8 +67,8 @@ export default class ExRecordPanel extends Panel { ...@@ -67,8 +67,8 @@ export default class ExRecordPanel extends Panel {
public showAni() { public showAni() {
if (this.isShowing) return; if (this.isShowing) return;
this.isShowing = true; this.isShowing = true;
this.y = this.height; this.y = this.height + layers.stageOffsetY * 2 + 100;
const _y = 1624 - this.height - layers.stageOffsetY + 50 + 50; const _y = 1624 - this.height - layers.stageOffsetY + 50 + 100;
Tween.get(this) Tween.get(this)
.to({y: _y}, 500, Ease.quartOut) .to({y: _y}, 500, Ease.quartOut)
.call(() => { .call(() => {
...@@ -76,6 +76,17 @@ export default class ExRecordPanel extends Panel { ...@@ -76,6 +76,17 @@ export default class ExRecordPanel extends Panel {
}); });
} }
public hideAni() {
return Tween.get(this)
.to({y: this.height + layers.stageOffsetY * 2 + 100}, 500, Ease.quartOut);
}
public hidePanel() {
this.hideAni().call(() => {
super.hidePanel();
});
}
start(data) { start(data) {
super.start(); super.start();
} }
......
src/panels/ShopPanel.ts
View file @ 3112aa83
...@@ -40,8 +40,8 @@ export default class ShopPanel extends Panel { ...@@ -40,8 +40,8 @@ export default class ShopPanel extends Panel {
public showAni() { public showAni() {
if (this.isShowing) return; if (this.isShowing) return;
this.isShowing = true; this.isShowing = true;
this.y = this.height; this.y = this.height + layers.stageOffsetY * 2 + 100;
const _y = 1624 - this.height - layers.stageOffsetY + 50 + 50; const _y = 1624 - this.height - layers.stageOffsetY + 50 + 100;
Tween.get(this) Tween.get(this)
.to({y: _y}, 500, Ease.quartOut) .to({y: _y}, 500, Ease.quartOut)
.call(() => { .call(() => {
...@@ -49,6 +49,17 @@ export default class ShopPanel extends Panel { ...@@ -49,6 +49,17 @@ export default class ShopPanel extends Panel {
}); });
} }
public hideAni() {
return Tween.get(this)
.to({y: this.height + layers.stageOffsetY * 2 + 100}, 500, Ease.quartOut);
}
public hidePanel() {
this.hideAni().call(() => {
super.hidePanel();
});
}
start(data) { start(data) {
super.start(); super.start();
} }
......
src/panels/TaskPanel.ts
View file @ 3112aa83
...@@ -81,8 +81,8 @@ export default class TaskPanel extends Panel { ...@@ -81,8 +81,8 @@ export default class TaskPanel extends Panel {
public showAni() { public showAni() {
if (this.isShowing) return; if (this.isShowing) return;
this.isShowing = true; this.isShowing = true;
this.y = this.height; this.y = this.height + layers.stageOffsetY * 2 + 100;
const _y = 1624 - this.height - layers.stageOffsetY + 50 + 50; const _y = 1624 - this.height - layers.stageOffsetY + 50 + 100;
Tween.get(this) Tween.get(this)
.to({y: _y}, 500, Ease.quartOut) .to({y: _y}, 500, Ease.quartOut)
.call(() => { .call(() => {
...@@ -90,6 +90,17 @@ export default class TaskPanel extends Panel { ...@@ -90,6 +90,17 @@ export default class TaskPanel extends Panel {
}); });
} }
public hideAni() {
return Tween.get(this)
.to({y: this.height + layers.stageOffsetY * 2 + 100}, 500, Ease.quartOut);
}
public hidePanel() {
this.hideAni().call(() => {
super.hidePanel();
});
}
start(data) { start(data) {
super.start(); super.start();
} }
......
src/panels/WareHousePanel.ts
View file @ 3112aa83
...@@ -46,7 +46,7 @@ export default class WareHousePanel extends Panel { ...@@ -46,7 +46,7 @@ export default class WareHousePanel extends Panel {
public showAni() { public showAni() {
if (this.isShowing) return; if (this.isShowing) return;
this.isShowing = true; this.isShowing = true;
this.y = this.height; this.y = this.height + layers.stageOffsetY * 2 + 100;
const _y = 1624 - this.height - layers.stageOffsetY + 50 + 100; const _y = 1624 - this.height - layers.stageOffsetY + 50 + 100;
Tween.get(this) Tween.get(this)
.to({y: _y}, 500, Ease.quartOut) .to({y: _y}, 500, Ease.quartOut)
...@@ -55,6 +55,16 @@ export default class WareHousePanel extends Panel { ...@@ -55,6 +55,16 @@ export default class WareHousePanel extends Panel {
}); });
} }
public hideAni() {
return Tween.get(this)
.to({y: this.height + layers.stageOffsetY * 2 + 100}, 500, Ease.quartOut);
}
public hidePanel() {
this.hideAni().call(() => {
super.hidePanel();
});
}
start(data) { start(data) {
super.start(); super.start();
......
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