Skip to content

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

111

parent 2b7e615e
Show whitespace changes
Inline Side-by-side
Showing with 43 additions and 19 deletions
.idea/workspace.xml
View file @ d1adc856
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
<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$/src/parts/Game/Effects/BirthEffect.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/parts/Game/Effects/BirthEffect.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scenes/GameScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scenes/GameScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scenes/LoadingScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scenes/LoadingScene.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/scenes/LoadingScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scenes/LoadingScene.ts" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -85,9 +83,9 @@ ...@@ -85,9 +83,9 @@
</configuration> </configuration>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="npm.dev" />
<item itemvalue="npm.handleRes" /> <item itemvalue="npm.handleRes" />
<item itemvalue="npm.flushRes" /> <item itemvalue="npm.flushRes" />
<item itemvalue="npm.dev" />
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
...@@ -104,7 +102,8 @@ ...@@ -104,7 +102,8 @@
<workItem from="1590749939792" duration="84000" /> <workItem from="1590749939792" duration="84000" />
<workItem from="1590976087296" duration="15316000" /> <workItem from="1590976087296" duration="15316000" />
<workItem from="1590996860067" duration="14333000" /> <workItem from="1590996860067" duration="14333000" />
<workItem from="1591062735465" duration="26724000" /> <workItem from="1591062735465" duration="27334000" />
<workItem from="1591148883764" duration="476000" />
</task> </task>
<task id="LOCAL-00001" summary="1"> <task id="LOCAL-00001" summary="1">
<created>1591003912929</created> <created>1591003912929</created>
...@@ -134,7 +133,14 @@ ...@@ -134,7 +133,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1591099412217</updated> <updated>1591099412217</updated>
</task> </task>
<option name="localTasksCounter" value="5" /> <task id="LOCAL-00005" summary="111">
<created>1591101112588</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1591101112588</updated>
</task>
<option name="localTasksCounter" value="6" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -147,40 +153,40 @@ ...@@ -147,40 +153,40 @@
<option name="LAST_COMMIT_MESSAGE" value="111" /> <option name="LAST_COMMIT_MESSAGE" value="111" />
</component> </component>
<component name="WindowStateProjectService"> <component name="WindowStateProjectService">
<state x="467" y="108" key="CommitChangelistDialog2" timestamp="1591099411935"> <state x="467" y="108" key="CommitChangelistDialog2" timestamp="1591101112105">
<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="467" y="108" key="CommitChangelistDialog2/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591099411935" /> <state x="467" y="108" key="CommitChangelistDialog2/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591101112105" />
<state width="303" height="907" key="GridCell.Tab.0.bottom" timestamp="1591099896058"> <state width="303" height="907" key="GridCell.Tab.0.bottom" timestamp="1591107083854">
<screen x="37" y="23" width="1643" height="1027" /> <screen x="37" y="23" width="1643" height="1027" />
</state> </state>
<state width="499" height="907" key="GridCell.Tab.0.bottom/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591065953118" /> <state width="499" height="907" key="GridCell.Tab.0.bottom/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591065953118" />
<state width="303" height="907" key="GridCell.Tab.0.bottom/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591099896058" /> <state width="303" height="907" key="GridCell.Tab.0.bottom/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591107083854" />
<state width="303" height="907" key="GridCell.Tab.0.center" timestamp="1591099896058"> <state width="303" height="907" key="GridCell.Tab.0.center" timestamp="1591107083851">
<screen x="37" y="23" width="1643" height="1027" /> <screen x="37" y="23" width="1643" height="1027" />
</state> </state>
<state width="499" height="907" key="GridCell.Tab.0.center/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591065953116" /> <state width="499" height="907" key="GridCell.Tab.0.center/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591065953116" />
<state width="303" height="907" key="GridCell.Tab.0.center/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591099896058" /> <state width="303" height="907" key="GridCell.Tab.0.center/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591107083851" />
<state width="303" height="907" key="GridCell.Tab.0.left" timestamp="1591099896055"> <state width="303" height="907" key="GridCell.Tab.0.left" timestamp="1591107083851">
<screen x="37" y="23" width="1643" height="1027" /> <screen x="37" y="23" width="1643" height="1027" />
</state> </state>
<state width="499" height="907" key="GridCell.Tab.0.left/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591065953114" /> <state width="499" height="907" key="GridCell.Tab.0.left/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591065953114" />
<state width="303" height="907" key="GridCell.Tab.0.left/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591099896055" /> <state width="303" height="907" key="GridCell.Tab.0.left/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591107083851" />
<state width="303" height="907" key="GridCell.Tab.0.right" timestamp="1591099896058"> <state width="303" height="907" key="GridCell.Tab.0.right" timestamp="1591107083852">
<screen x="37" y="23" width="1643" height="1027" /> <screen x="37" y="23" width="1643" height="1027" />
</state> </state>
<state width="499" height="907" key="GridCell.Tab.0.right/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591065953118" /> <state width="499" height="907" key="GridCell.Tab.0.right/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591065953118" />
<state width="303" height="907" key="GridCell.Tab.0.right/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591099896058" /> <state width="303" height="907" key="GridCell.Tab.0.right/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591107083852" />
<state x="615" y="245" key="RollbackChangesDialog" timestamp="1591077661188"> <state x="615" y="245" key="RollbackChangesDialog" timestamp="1591077661188">
<screen x="37" y="23" width="1643" height="1027" /> <screen x="37" y="23" width="1643" height="1027" />
</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="1591099413476"> <state x="457" y="276" key="Vcs.Push.Dialog.v2" timestamp="1591101114140">
<screen x="37" y="23" width="1643" height="1027" /> <screen x="37" y="23" width="1643" height="1027" />
</state> </state>
<state x="457" y="276" key="Vcs.Push.Dialog.v2/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591099413476" /> <state x="457" y="276" key="Vcs.Push.Dialog.v2/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591101114140" />
<state x="564" y="285" width="587" height="502" key="find.popup" timestamp="1591099201430"> <state x="564" y="285" width="587" height="502" key="find.popup" timestamp="1591099201430">
<screen x="37" y="23" width="1643" height="1027" /> <screen x="37" y="23" width="1643" height="1027" />
</state> </state>
...@@ -189,10 +195,10 @@ ...@@ -189,10 +195,10 @@
<screen x="35" y="23" width="1645" height="1027" /> <screen x="35" y="23" width="1645" height="1027" />
</state> </state>
<state x="586" y="314" key="refactoring.ChangeSignatureDialog/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1590980819551" /> <state x="586" y="314" key="refactoring.ChangeSignatureDialog/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1590980819551" />
<state x="523" y="250" width="670" height="676" key="search.everywhere.popup" timestamp="1591100526463"> <state x="523" y="250" width="670" height="676" key="search.everywhere.popup" timestamp="1591149243614">
<screen x="37" y="23" width="1643" height="1027" /> <screen x="37" y="23" width="1643" height="1027" />
</state> </state>
<state x="522" y="250" width="670" height="676" key="search.everywhere.popup/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591066027960" /> <state x="522" y="250" width="670" height="676" key="search.everywhere.popup/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591066027960" />
<state x="523" y="250" width="670" height="676" key="search.everywhere.popup/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591100526463" /> <state x="523" y="250" width="670" height="676" key="search.everywhere.popup/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591149243614" />
</component> </component>
</project> </project>
\ No newline at end of file
src/scenes/LoadingScene.ts
View file @ d1adc856
...@@ -11,6 +11,7 @@ import SceneCtrl from "../../module/ctrls/sceneCtrl"; ...@@ -11,6 +11,7 @@ import SceneCtrl from "../../module/ctrls/sceneCtrl";
import { GameScene } from "./GameScene"; import { GameScene } from "./GameScene";
import OptionPool from "../const/OptionPool"; import OptionPool from "../const/OptionPool";
import PlantEffectPool from "../const/PlantEffectPool"; import PlantEffectPool from "../const/PlantEffectPool";
import TextField = FYGE.TextField;
export class LoadingScene extends Scene { export class LoadingScene extends Scene {
...@@ -24,6 +25,7 @@ export class LoadingScene extends Scene { ...@@ -24,6 +25,7 @@ export class LoadingScene extends Scene {
private progressBar: Container; private progressBar: Container;
private progressMask: Graphics; private progressMask: Graphics;
private progressFill: Sprite; private progressFill: Sprite;
private tips: TextField;
initUi() { initUi() {
this.addChild(Tool.getSprite('loading_bg.jpg')); this.addChild(Tool.getSprite('loading_bg.jpg'));
...@@ -55,6 +57,13 @@ export class LoadingScene extends Scene { ...@@ -55,6 +57,13 @@ export class LoadingScene extends Scene {
this.progressMask.drawRect(38, 10, 464, 56); this.progressMask.drawRect(38, 10, 464, 56);
this.progressFill.mask = this.progressMask; this.progressFill.mask = this.progressMask;
// tips
this.tips = this.addChild(new TextField());
this.tips.text = '正在加载中，请稍后';
this.tips.size = 24;
this.tips.fillColor = '#244b00';
this.tips.position.set((this.width - this.tips.textWidth) / 2, 1260);
} }
start() { start() {
...@@ -68,6 +77,10 @@ export class LoadingScene extends Scene { ...@@ -68,6 +77,10 @@ export class LoadingScene extends Scene {
OptionPool.ins; OptionPool.ins;
PlantEffectPool.ins; PlantEffectPool.ins;
Tween.get(this.tips, {loop: true})
.to({alpha: 0.5}, 500, Ease.quadInOut)
.to({alpha: 1}, 500, Ease.quadInOut);
this.titleEffect().call(() => { this.titleEffect().call(() => {
this.startLoading().call(() => { this.startLoading().call(() => {
SceneCtrl.instance.change(GameScene); SceneCtrl.instance.change(GameScene);
...@@ -104,5 +117,10 @@ export class LoadingScene extends Scene { ...@@ -104,5 +117,10 @@ export class LoadingScene extends Scene {
} }
public destroy() {
super.destroy();
Tween.removeTweens(this.tips);
}
} }
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