Skip to content

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

effect

parent f4105d68
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 23 deletions
.idea/workspace.xml
View file @ 28f60ef5
...@@ -2,9 +2,12 @@ ...@@ -2,9 +2,12 @@
<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$/src/panels/FreePowerPanel.ts" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/panels/TaskPanel.ts" 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$/src/scene/map/MapScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapScene.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/panels/StartPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/StartPanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/StartPanelPrize.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/StartPanelPrize.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/MapUI.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapUI.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" />
...@@ -103,7 +106,7 @@ ...@@ -103,7 +106,7 @@
<workItem from="1594111755267" duration="29551000" /> <workItem from="1594111755267" duration="29551000" />
<workItem from="1594260676967" duration="30060000" /> <workItem from="1594260676967" duration="30060000" />
<workItem from="1594604662575" duration="27200000" /> <workItem from="1594604662575" duration="27200000" />
<workItem from="1594691193000" duration="7171000" /> <workItem from="1594691193000" duration="10609000" />
</task> </task>
<task id="LOCAL-00001" summary="111"> <task id="LOCAL-00001" summary="111">
<created>1594122339119</created> <created>1594122339119</created>
...@@ -175,7 +178,14 @@ ...@@ -175,7 +178,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1594697145788</updated> <updated>1594697145788</updated>
</task> </task>
<option name="localTasksCounter" value="11" /> <task id="LOCAL-00011" summary="map effect">
<created>1594698378321</created>
<option name="number" value="00011" />
<option name="presentableId" value="LOCAL-00011" />
<option name="project" value="LOCAL" />
<updated>1594698378321</updated>
</task>
<option name="localTasksCounter" value="12" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -199,10 +209,10 @@ ...@@ -199,10 +209,10 @@
<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="754" y="183" key="CommitChangelistDialog2" timestamp="1594697145603"> <state x="754" y="183" key="CommitChangelistDialog2" timestamp="1594698378120">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="754" y="183" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1594697145603" /> <state x="754" y="183" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1594698378120" />
<state width="882" height="329" key="GridCell.Tab.0.bottom" timestamp="1594693733806"> <state width="882" height="329" key="GridCell.Tab.0.bottom" timestamp="1594693733806">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
...@@ -227,14 +237,14 @@ ...@@ -227,14 +237,14 @@
<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="1594697157436"> <state x="92" y="351" key="Vcs.Push.Dialog.v2" timestamp="1594698382173">
<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="1594697157436" /> <state x="92" y="351" key="Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177" timestamp="1594698382173" />
<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="1594705166397">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<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="87" y="216" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/31.23.1889.1177@31.23.1889.1177" timestamp="1594705166397" />
<state x="907" y="23" width="879" height="1158" key="dock-window-1" timestamp="1594284506599"> <state x="907" y="23" width="879" height="1158" key="dock-window-1" timestamp="1594284506599">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
...@@ -255,9 +265,9 @@ ...@@ -255,9 +265,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="1594697852123"> <state x="640" y="288" width="670" height="676" key="search.everywhere.popup" timestamp="1594706884230">
<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="1594697852123" /> <state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1594706884230" />
</component> </component>
</project> </project>
\ No newline at end of file
src/panels/StartPanel.ts
View file @ 28f60ef5
...@@ -31,7 +31,7 @@ export class StartPanel extends Panel { ...@@ -31,7 +31,7 @@ export class StartPanel extends Panel {
this.anchor.set(375, 812); this.anchor.set(375, 812);
Tween.get(this) Tween.get(this)
.set({scaleX: 0, scaleY: 0}) .set({scaleX: 0, scaleY: 0})
.to({scaleX: 1, scaleY: 1}, 400, FYGE.Ease.backOut) .to({scaleX: 1, scaleY: 1}, 400, Ease.backOut)
.call(() => { .call(() => {
this.isShowing = false; this.isShowing = false;
}); });
......
src/panels/StartPanelPrize.ts
View file @ 28f60ef5
...@@ -5,6 +5,7 @@ import { PlayScene } from "../scene/PlayScene"; ...@@ -5,6 +5,7 @@ import { PlayScene } from "../scene/PlayScene";
import { StartTarget } from "./StartPanel"; import { StartTarget } from "./StartPanel";
import TEXT_ALIGN = FYGE.TEXT_ALIGN; import TEXT_ALIGN = FYGE.TEXT_ALIGN;
import Tween = FYGE.Tween; import Tween = FYGE.Tween;
import Ease = FYGE.Ease;
export class StartPanelPrize extends Panel { export class StartPanelPrize extends Panel {
get groupNames() { get groupNames() {
...@@ -21,7 +22,7 @@ export class StartPanelPrize extends Panel { ...@@ -21,7 +22,7 @@ export class StartPanelPrize extends Panel {
this.anchor.set(375, 812); this.anchor.set(375, 812);
Tween.get(this) Tween.get(this)
.set({scaleX: 0, scaleY: 0}) .set({scaleX: 0, scaleY: 0})
.to({scaleX: 1, scaleY: 1}, 400, FYGE.Ease.backOut) .to({scaleX: 1, scaleY: 1}, 400, Ease.backOut)
.call(() => { .call(() => {
this.isShowing = false; this.isShowing = false;
}); });
......
src/panels/TaskPanel.ts 0 → 100644
View file @ 28f60ef5
import { Panel } from "../../module/views/Panel";
import { layers } from "../../module/views/layers";
import Tween = FYGE.Tween;
import Ease = FYGE.Ease;
import Button = FYGE.Button;
export class TaskPanel extends Panel {
get groupNames() {
return ["TaskPanel"]
}
get skinName() {
return "TaskPanel"
}
public showAni() {
if (this.isShowing) return;
this.isShowing = true;
let oriY = 1624 - this.height - layers.stageOffsetY - 580;
this.y = layers.stageHeight + this.height;
Tween.get(this)
.to({y: oriY}, 500, Ease.quartOut)
.call(() => {
this.isShowing = false;
});
}
closeBtn: Button;
taskBtn1: Button;
taskBtn2: Button;
taskBtn3: Button;
taskBtn4: Button;
initUi() {
}
start(data) {
super.start();
}
initEvents() {
super.initEvents();
}
removeEvents() {
super.removeEvents();
}
}
src/scene/map/CheckBtn.ts
View file @ 28f60ef5
...@@ -183,6 +183,7 @@ export default class CheckBtn extends Container { ...@@ -183,6 +183,7 @@ export default class CheckBtn extends Container {
this.checkLabel.stroke = 2; this.checkLabel.stroke = 2;
this.checkLabel.strokeColor = '#316ec6'; this.checkLabel.strokeColor = '#316ec6';
// 当前关卡动画
this.checkCurEffect = this.addChild(new CheckCurEffect()); this.checkCurEffect = this.addChild(new CheckCurEffect());
this.checkCurEffect.visible = false; this.checkCurEffect.visible = false;
...@@ -201,6 +202,9 @@ export default class CheckBtn extends Container { ...@@ -201,6 +202,9 @@ export default class CheckBtn extends Container {
} }
/**
* 关卡按钮star
*/
class CheckStar extends Sprite { class CheckStar extends Sprite {
private static starEnableTexture: Texture = null; private static starEnableTexture: Texture = null;
...@@ -221,6 +225,9 @@ class CheckStar extends Sprite { ...@@ -221,6 +225,9 @@ class CheckStar extends Sprite {
} }
/**
* 当前关卡的动画
*/
class CheckCurEffect extends Container { class CheckCurEffect extends Container {
private light1: Sprite = null; private light1: Sprite = null;
...@@ -241,15 +248,6 @@ class CheckCurEffect extends Container { ...@@ -241,15 +248,6 @@ class CheckCurEffect extends Container {
public play() { public play() {
// 时间 0 0.4 0.7 1 1.3 2
// point_light_1
// 缩放 0% 150% 150%
// 透明度 100% 0 0
// point_light_2
// 缩放 80% 130% 130%
// 透明度 0% 100% 0% 0%
Tween.get(this.light1, {loop: true}) Tween.get(this.light1, {loop: true})
.set({scaleX: 0, scaleY: 0}) .set({scaleX: 0, scaleY: 0})
.to({scaleX: 1.5, scaleY: 1.5}, 1300) .to({scaleX: 1.5, scaleY: 1.5}, 1300)
......
src/scene/map/MapUI.ts
View file @ 28f60ef5
...@@ -9,6 +9,7 @@ import MouseEvent = FYGE.MouseEvent; ...@@ -9,6 +9,7 @@ import MouseEvent = FYGE.MouseEvent;
import { showPanel } from "../../../module/ctrls"; import { showPanel } from "../../../module/ctrls";
import { RulePanel } from "../../panels/RulePanel"; import { RulePanel } from "../../panels/RulePanel";
import { BuyPowerPanel } from "../../panels/BuyPowerPanel"; import { BuyPowerPanel } from "../../panels/BuyPowerPanel";
import { TaskPanel } from "../../panels/TaskPanel";
export default class MapUI extends Container { export default class MapUI extends Container {
public energyBox: EnergyBox = null; public energyBox: EnergyBox = null;
...@@ -31,12 +32,14 @@ export default class MapUI extends Container { ...@@ -31,12 +32,14 @@ export default class MapUI extends Container {
this.ruleBtn.addEventListener(MouseEvent.CLICK, this.clickBtn, this); this.ruleBtn.addEventListener(MouseEvent.CLICK, this.clickBtn, this);
this.myPrizeBtn.addEventListener(MouseEvent.CLICK, this.clickBtn, this); this.myPrizeBtn.addEventListener(MouseEvent.CLICK, this.clickBtn, this);
this.prizeBox.addEventListener(MouseEvent.CLICK, this.clickBtn, this); this.prizeBox.addEventListener(MouseEvent.CLICK, this.clickBtn, this);
this.taskBtn.addEventListener(MouseEvent.CLICK, this.clickBtn, this);
} }
private removeEvent() { private removeEvent() {
this.ruleBtn.removeEventListener(MouseEvent.CLICK, this.clickBtn, this); this.ruleBtn.removeEventListener(MouseEvent.CLICK, this.clickBtn, this);
this.myPrizeBtn.removeEventListener(MouseEvent.CLICK, this.clickBtn, this); this.myPrizeBtn.removeEventListener(MouseEvent.CLICK, this.clickBtn, this);
this.prizeBox.removeEventListener(MouseEvent.CLICK, this.clickBtn, this); this.prizeBox.removeEventListener(MouseEvent.CLICK, this.clickBtn, this);
this.taskBtn.removeEventListener(MouseEvent.CLICK, this.clickBtn, this);
} }
private clickBtn(e) { private clickBtn(e) {
...@@ -56,6 +59,12 @@ export default class MapUI extends Container { ...@@ -56,6 +59,12 @@ export default class MapUI extends Container {
/// TODO 奖励盒子 /// TODO 奖励盒子
console.log('奖励盒子'); console.log('奖励盒子');
break; break;
case this.taskBtn:
/// TODO 任务
console.log('任务');
showPanel(TaskPanel);
break;
} }
} }
......
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