Skip to content

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

1111

parent 1abe8895
Show whitespace changes
Inline Side-by-side
Showing with 42 additions and 12906 deletions
.gitignore
View file @ 254f14b8
......@@ -2,3 +2,5 @@
node_modules
./released
.DS_Store
output.js
output.js.map
.idea/workspace.xml
View file @ 254f14b8
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="31be0130-d27d-4740-b668-956a8050e1bf" name="Default Changelist" comment="1111">
<list default="true" id="31be0130-d27d-4740-b668-956a8050e1bf" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/qiaqia2.exchangeGoods.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/qiaqia2.exchangeGoods.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/module/ctrls/index.ts" beforeDir="false" afterPath="$PROJECT_DIR$/module/ctrls/index.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/module/ctrls/toastCtrl.ts" beforeDir="false" afterPath="$PROJECT_DIR$/module/ctrls/toastCtrl.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/output.js" beforeDir="false" afterPath="$PROJECT_DIR$/output.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/res.json" beforeDir="false" afterPath="$PROJECT_DIR$/released/resource/res.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/gameScene/种植框_核桃.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/gameScene/种植框_山核桃.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/res.json" beforeDir="false" afterPath="$PROJECT_DIR$/resource/res.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/wareHouse/wareHouse_核桃.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/wareHouse/wareHouse_山核桃.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/scripts/copyJs.js" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/copyJs.js" 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/TaoBaoNet.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/TaoBaoNet.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/const/myLab.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/const/myLab.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/const/staticData.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/const/staticData.ts" 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/ExSuccessPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/ExSuccessPanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/ExchangePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/ExchangePanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/GuidePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/GuidePanel.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/parts/Game/GameLayer.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/parts/Game/GameLayer.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/parts/Game/GuideLayer.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/parts/Game/GuideLayer.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/parts/Game/Land.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/parts/Game/Land.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/parts/Game/ProgressBar.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/parts/Game/ProgressBar.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" />
</list>
<option name="SHOW_DIALOG" value="false" />
......@@ -130,11 +110,11 @@
<method v="2" />
</configuration>
<list>
<item itemvalue="Node.js.test.js" />
<item itemvalue="npm.build" />
<item itemvalue="npm.buildTS" />
<item itemvalue="npm.flushRes" />
<item itemvalue="npm.dev" />
<item itemvalue="Node.js.test.js" />
</list>
<recent_temporary>
<list>
......@@ -176,7 +156,8 @@
<workItem from="1591933343958" duration="21725000" />
<workItem from="1592202867636" duration="167000" />
<workItem from="1592203763793" duration="21589000" />
<workItem from="1592273018019" duration="23278000" />
<workItem from="1592273018019" duration="24906000" />
<workItem from="1592358392926" duration="3590000" />
</task>
<task id="LOCAL-00001" summary="1">
<created>1591003912929</created>
......@@ -472,7 +453,14 @@
<option name="project" value="LOCAL" />
<updated>1591966186128</updated>
</task>
<option name="localTasksCounter" value="43" />
<task id="LOCAL-00043" summary="1111">
<created>1592304551502</created>
<option name="number" value="00043" />
<option name="presentableId" value="LOCAL-00043" />
<option name="project" value="LOCAL" />
<updated>1592304551502</updated>
</task>
<option name="localTasksCounter" value="44" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -527,25 +515,25 @@
</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="764" y="293" key="#com.intellij.ide.util.MemberChooser/37.23.1883.1177@37.23.1883.1177" timestamp="1591929411133" />
<state x="411" y="44" key="CommitChangelistDialog2" timestamp="1592293157840">
<screen x="35" y="23" width="1405" height="877" />
<state x="540" y="230" key="CommitChangelistDialog2" timestamp="1592304550584">
<screen x="35" y="23" width="1885" height="1177" />
</state>
<state x="502" y="120" key="CommitChangelistDialog2/0.23.1920.1177@0.23.1920.1177" timestamp="1591884607456" />
<state x="411" y="44" key="CommitChangelistDialog2/35.23.1405.877@35.23.1405.877" timestamp="1592293157840" />
<state x="466" y="108" key="CommitChangelistDialog2/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591003912498" />
<state x="540" y="230" key="CommitChangelistDialog2/35.23.1885.1177@35.23.1885.1177" timestamp="1592203016503" />
<state x="540" y="230" key="CommitChangelistDialog2/35.23.1885.1177@35.23.1885.1177" timestamp="1592304550584" />
<state x="541" y="230" key="CommitChangelistDialog2/36.23.1884.1177@36.23.1884.1177" timestamp="1591966185870" />
<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="1591846770902" />
<state x="467" y="108" key="CommitChangelistDialog2/37.23.1643.1027@37.23.1643.1027" timestamp="1591785684954" />
<state x="529" y="120" key="CommitChangelistDialog2/37.23.1883.1177@37.23.1883.1177" timestamp="1591931899805" />
<state width="1843" height="191" key="GridCell.Tab.0.bottom" timestamp="1592303809774">
<state width="1843" height="191" key="GridCell.Tab.0.bottom" timestamp="1592362608492">
<screen x="35" y="23" width="1885" height="1177" />
</state>
<state width="1601" height="346" key="GridCell.Tab.0.bottom/0.23.1920.1177@0.23.1920.1177" timestamp="1591884614404" />
<state width="1363" height="191" key="GridCell.Tab.0.bottom/35.23.1405.877@35.23.1405.877" timestamp="1592296979551" />
<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="1843" height="191" key="GridCell.Tab.0.bottom/35.23.1885.1177@35.23.1885.1177" timestamp="1592303809774" />
<state width="1843" height="191" key="GridCell.Tab.0.bottom/35.23.1885.1177@35.23.1885.1177" timestamp="1592362608492" />
<state width="1602" height="270" key="GridCell.Tab.0.bottom/36.23.1644.1027@36.23.1644.1027" timestamp="1591942534759" />
<state width="1842" height="270" key="GridCell.Tab.0.bottom/36.23.1884.1177@36.23.1884.1177" timestamp="1591966213327" />
<state width="252" height="1057" key="GridCell.Tab.0.bottom/37.23.1403.877/1440.-199.1920.1177@1440.-199.1920.1177" timestamp="1591854408198" />
......@@ -553,13 +541,13 @@
<state width="252" height="907" key="GridCell.Tab.0.bottom/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591852525606" />
<state width="311" height="907" key="GridCell.Tab.0.bottom/37.23.1643.1027@37.23.1643.1027" timestamp="1591713871414" />
<state width="923" height="270" key="GridCell.Tab.0.bottom/37.23.1883.1177@37.23.1883.1177" timestamp="1591932785471" />
<state width="1843" height="191" key="GridCell.Tab.0.center" timestamp="1592303809772">
<state width="1843" height="191" key="GridCell.Tab.0.center" timestamp="1592362608492">
<screen x="35" y="23" width="1885" height="1177" />
</state>
<state width="1601" height="346" key="GridCell.Tab.0.center/0.23.1920.1177@0.23.1920.1177" timestamp="1591884614404" />
<state width="1363" height="191" key="GridCell.Tab.0.center/35.23.1405.877@35.23.1405.877" timestamp="1592296979547" />
<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="1843" height="191" key="GridCell.Tab.0.center/35.23.1885.1177@35.23.1885.1177" timestamp="1592303809772" />
<state width="1843" height="191" key="GridCell.Tab.0.center/35.23.1885.1177@35.23.1885.1177" timestamp="1592362608492" />
<state width="1602" height="270" key="GridCell.Tab.0.center/36.23.1644.1027@36.23.1644.1027" timestamp="1591942534759" />
<state width="1842" height="270" key="GridCell.Tab.0.center/36.23.1884.1177@36.23.1884.1177" timestamp="1591966213327" />
<state width="252" height="1057" key="GridCell.Tab.0.center/37.23.1403.877/1440.-199.1920.1177@1440.-199.1920.1177" timestamp="1591854408196" />
......@@ -567,13 +555,13 @@
<state width="252" height="907" key="GridCell.Tab.0.center/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591852525596" />
<state width="311" height="907" key="GridCell.Tab.0.center/37.23.1643.1027@37.23.1643.1027" timestamp="1591713871413" />
<state width="923" height="270" key="GridCell.Tab.0.center/37.23.1883.1177@37.23.1883.1177" timestamp="1591932785471" />
<state width="1843" height="191" key="GridCell.Tab.0.left" timestamp="1592303809769">
<state width="1843" height="191" key="GridCell.Tab.0.left" timestamp="1592362608491">
<screen x="35" y="23" width="1885" height="1177" />
</state>
<state width="1601" height="346" key="GridCell.Tab.0.left/0.23.1920.1177@0.23.1920.1177" timestamp="1591884614403" />
<state width="1363" height="191" key="GridCell.Tab.0.left/35.23.1405.877@35.23.1405.877" timestamp="1592296979544" />
<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="1843" height="191" key="GridCell.Tab.0.left/35.23.1885.1177@35.23.1885.1177" timestamp="1592303809769" />
<state width="1843" height="191" key="GridCell.Tab.0.left/35.23.1885.1177@35.23.1885.1177" timestamp="1592362608491" />
<state width="1602" height="270" key="GridCell.Tab.0.left/36.23.1644.1027@36.23.1644.1027" timestamp="1591942534758" />
<state width="1842" height="270" key="GridCell.Tab.0.left/36.23.1884.1177@36.23.1884.1177" timestamp="1591966213326" />
<state width="252" height="1057" key="GridCell.Tab.0.left/37.23.1403.877/1440.-199.1920.1177@1440.-199.1920.1177" timestamp="1591854408195" />
......@@ -581,13 +569,13 @@
<state width="252" height="907" key="GridCell.Tab.0.left/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591852525590" />
<state width="311" height="907" key="GridCell.Tab.0.left/37.23.1643.1027@37.23.1643.1027" timestamp="1591713871412" />
<state width="923" height="270" key="GridCell.Tab.0.left/37.23.1883.1177@37.23.1883.1177" timestamp="1591932785471" />
<state width="1843" height="191" key="GridCell.Tab.0.right" timestamp="1592303809773">
<state width="1843" height="191" key="GridCell.Tab.0.right" timestamp="1592362608492">
<screen x="35" y="23" width="1885" height="1177" />
</state>
<state width="1601" height="346" key="GridCell.Tab.0.right/0.23.1920.1177@0.23.1920.1177" timestamp="1591884614404" />
<state width="1363" height="191" key="GridCell.Tab.0.right/35.23.1405.877@35.23.1405.877" timestamp="1592296979549" />
<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="1843" height="191" key="GridCell.Tab.0.right/35.23.1885.1177@35.23.1885.1177" timestamp="1592303809773" />
<state width="1843" height="191" key="GridCell.Tab.0.right/35.23.1885.1177@35.23.1885.1177" timestamp="1592362608492" />
<state width="1602" height="270" key="GridCell.Tab.0.right/36.23.1644.1027@36.23.1644.1027" timestamp="1591942534759" />
<state width="1842" height="270" key="GridCell.Tab.0.right/36.23.1884.1177@36.23.1884.1177" timestamp="1591966213327" />
<state width="252" height="1057" key="GridCell.Tab.0.right/37.23.1403.877/1440.-199.1920.1177@1440.-199.1920.1177" timestamp="1591854408196" />
......@@ -609,10 +597,11 @@
<screen x="35" y="23" width="1405" height="877" />
</state>
<state width="500" height="445" key="SwitcherDM/35.23.1405.877@35.23.1405.877" timestamp="1592292721015" />
<state x="518" y="313" key="Vcs.Push.Dialog.v2" timestamp="1591966205725">
<screen x="36" y="23" width="1884" height="1177" />
<state x="517" y="313" key="Vcs.Push.Dialog.v2" timestamp="1592304568190">
<screen x="35" y="23" width="1885" height="1177" />
</state>
<state x="491" y="313" key="Vcs.Push.Dialog.v2/0.23.1920.1177@0.23.1920.1177" timestamp="1591884609437" />
<state x="517" y="313" key="Vcs.Push.Dialog.v2/35.23.1885.1177@35.23.1885.1177" timestamp="1592304568190" />
<state x="518" y="313" key="Vcs.Push.Dialog.v2/36.23.1884.1177@36.23.1884.1177" timestamp="1591966205725" />
<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="1591846773289" />
......@@ -624,9 +613,10 @@
<screen x="37" y="23" width="1643" height="1027" />
</state>
<state x="660" y="456" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591688329482" />
<state x="564" y="285" width="587" height="502" key="find.popup" timestamp="1591099201430">
<screen x="37" y="23" width="1643" height="1027" />
<state x="640" y="323" width="674" height="753" key="find.popup" timestamp="1592360649683">
<screen x="35" y="23" width="1885" height="1177" />
</state>
<state x="640" y="323" width="674" height="753" key="find.popup/35.23.1885.1177@35.23.1885.1177" timestamp="1592360649683" />
<state x="564" y="285" width="587" height="502" key="find.popup/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591099201430" />
<state x="586" y="314" key="refactoring.ChangeSignatureDialog" timestamp="1590980819551">
<screen x="35" y="23" width="1645" height="1027" />
......@@ -636,13 +626,13 @@
<screen x="0" y="23" width="1920" height="1177" />
</state>
<state x="85" y="286" key="run.anything.popup/0.23.1920.1177@0.23.1920.1177" timestamp="1591883929114" />
<state x="592" y="283" width="903" height="778" key="search.everywhere.popup" timestamp="1592303660557">
<state x="592" y="283" width="903" height="778" key="search.everywhere.popup" timestamp="1592362550991">
<screen x="35" y="23" width="1885" height="1177" />
</state>
<state x="568" y="283" width="917" height="776" key="search.everywhere.popup/0.23.1920.1177@0.23.1920.1177" timestamp="1591884167098" />
<state x="450" y="217" width="674" height="580" key="search.everywhere.popup/35.23.1405.877@35.23.1405.877" timestamp="1592296171796" />
<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="592" y="283" width="903" height="778" key="search.everywhere.popup/35.23.1885.1177@35.23.1885.1177" timestamp="1592303660557" />
<state x="592" y="283" width="903" height="778" key="search.everywhere.popup/35.23.1885.1177@35.23.1885.1177" timestamp="1592362550991" />
<state x="522" y="250" width="788" height="679" key="search.everywhere.popup/36.23.1644.1027@36.23.1644.1027" timestamp="1591942795629" />
<state x="593" y="283" width="902" height="778" key="search.everywhere.popup/36.23.1884.1177@36.23.1884.1177" timestamp="1591965824178" />
<state x="452" y="217" width="670" height="578" key="search.everywhere.popup/37.23.1403.877/1440.-199.1920.1177@37.23.1403.877" timestamp="1591854180825" />
......
output.js deleted 100644 → 0
View file @ 1abe8895
This source diff could not be displayed because it is too large. You can view the blob instead.
src/panels/ShopPanel.ts
View file @ 254f14b8
......@@ -233,12 +233,8 @@ function MGet() {
return MPool.splice(0, 1)[0] || new ShopItemExchangeInfo();
}
function MPush(obj: ShopItemExchangeInfo) {
export function MPush(obj: ShopItemExchangeInfo) {
MPool.push(obj);
}
for (let i = 0; i <= 20; i++) {
MPush(new ShopItemExchangeInfo());
}
src/parts/Game/GuideLayer.ts
View file @ 254f14b8
......@@ -52,7 +52,7 @@ export default class GuideLayer extends Container {
super();
this.bg = this.addChild(new FYGE.Graphics());
this.bg.beginFill(0, 1);
this.bg.beginFill(0x000000, 1);
this.bg.drawRect(0, 0, 750, 1624);
this.bg.endFill();
this.bg.alpha = 0;
......
src/parts/Game/ProgressBar.ts
View file @ 254f14b8
......@@ -105,7 +105,6 @@ export default class ProgressBar extends Container {
setTimeout(() => {
this.hidden();
}, 500);
this.dispatchEvent('endTime');
}
}, 1000);
......
src/scenes/LoadingScene.ts
View file @ 254f14b8
......@@ -16,6 +16,7 @@ import Ease = FYGE.Ease;
import Graphics = FYGE.Graphics;
import TextField = FYGE.TextField;
import { GuideScene } from "./GuideScene";
import { MPush, ShopItemExchangeInfo } from "../panels/ShopPanel";
export class LoadingScene extends Scene {
......@@ -143,6 +144,11 @@ export class LoadingScene extends Scene {
SceneCtrl.instance.change(gameInfo.guideIsEnd ? GameScene : GuideScene);
});
});
for (let i = 0; i <= 20; i++) {
MPush(new ShopItemExchangeInfo());
}
}
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