Skip to content

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

1111

parent 348688ed
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 36 deletions
.idea/workspace.xml
View file @ dd7c7b58
......@@ -3,8 +3,10 @@
<component name="ChangeListManager">
<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$/mock/miniTb/qiaqia2.getExchangeGoodsList.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/qiaqia2.getExchangeGoodsList.json" 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$/mock/miniTb/qiaqiaHome.getGameInfo.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/qiaqiaHome.getGameInfo.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Tools.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/Tools.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/scenes/GuideScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scenes/GuideScene.ts" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -65,7 +67,7 @@
<recent name="$PROJECT_DIR$/resource/taskPanel" />
</key>
</component>
<component name="RunManager" selected="npm.dev">
<component name="RunManager" selected="npm.buildTS">
<configuration name="build" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
<package-json value="$PROJECT_DIR$/package.json" />
<command value="run" />
......@@ -114,8 +116,8 @@
</list>
<recent_temporary>
<list>
<item itemvalue="npm.dev" />
<item itemvalue="npm.buildTS" />
<item itemvalue="npm.dev" />
<item itemvalue="npm.build" />
<item itemvalue="npm.flushRes" />
</list>
......@@ -163,7 +165,10 @@
<workItem from="1592798391152" duration="39000" />
<workItem from="1592805639033" duration="46000" />
<workItem from="1592830801526" duration="805000" />
<workItem from="1592880254194" duration="55000" />
<workItem from="1592880254194" duration="133000" />
<workItem from="1592891317317" duration="225000" />
<workItem from="1592898077650" duration="39000" />
<workItem from="1592899588446" duration="730000" />
</task>
<task id="LOCAL-00001" summary="1">
<created>1591003912929</created>
......@@ -494,7 +499,14 @@
<option name="project" value="LOCAL" />
<updated>1592449548855</updated>
</task>
<option name="localTasksCounter" value="48" />
<task id="LOCAL-00048" summary="1111">
<created>1592880318373</created>
<option name="number" value="00048" />
<option name="presentableId" value="LOCAL-00048" />
<option name="project" value="LOCAL" />
<updated>1592880318373</updated>
</task>
<option name="localTasksCounter" value="49" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -551,11 +563,11 @@
</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="525" y="120" key="CommitChangelistDialog2" timestamp="1592449548514">
<state x="525" y="120" key="CommitChangelistDialog2" timestamp="1592880318097">
<screen x="32" y="23" width="1888" height="1177" />
</state>
<state x="502" y="120" key="CommitChangelistDialog2/0.23.1920.1177@0.23.1920.1177" timestamp="1591884607456" />
<state x="525" y="120" key="CommitChangelistDialog2/32.23.1888.1177@32.23.1888.1177" timestamp="1592449548514" />
<state x="525" y="120" key="CommitChangelistDialog2/32.23.1888.1177@32.23.1888.1177" timestamp="1592880318097" />
<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="1592373725900" />
......@@ -564,11 +576,12 @@
<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="1592385429485" />
<state width="1366" height="130" key="GridCell.Tab.0.bottom" timestamp="1592832798441">
<screen x="32" y="23" width="1888" height="1177" />
<state width="1366" height="130" key="GridCell.Tab.0.bottom" timestamp="1592900135143">
<screen x="31" y="23" width="1889" 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="1366" height="130" key="GridCell.Tab.0.bottom/32.23.1888.1177@32.23.1888.1177" timestamp="1592832798441" />
<state width="1366" height="130" key="GridCell.Tab.0.bottom/31.23.1889.1177@31.23.1889.1177" timestamp="1592900135143" />
<state width="1366" height="130" key="GridCell.Tab.0.bottom/32.23.1888.1177@32.23.1888.1177" timestamp="1592891542793" />
<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="930" height="191" key="GridCell.Tab.0.bottom/35.23.1885.1177@35.23.1885.1177" timestamp="1592393512540" />
......@@ -579,11 +592,12 @@
<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="930" height="191" key="GridCell.Tab.0.bottom/37.23.1883.1177@37.23.1883.1177" timestamp="1592385235055" />
<state width="1366" height="130" key="GridCell.Tab.0.center" timestamp="1592832798440">
<screen x="32" y="23" width="1888" height="1177" />
<state width="1366" height="130" key="GridCell.Tab.0.center" timestamp="1592900135143">
<screen x="31" y="23" width="1889" 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="1366" height="130" key="GridCell.Tab.0.center/32.23.1888.1177@32.23.1888.1177" timestamp="1592832798440" />
<state width="1366" height="130" key="GridCell.Tab.0.center/31.23.1889.1177@31.23.1889.1177" timestamp="1592900135143" />
<state width="1366" height="130" key="GridCell.Tab.0.center/32.23.1888.1177@32.23.1888.1177" timestamp="1592891542793" />
<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="930" height="191" key="GridCell.Tab.0.center/35.23.1885.1177@35.23.1885.1177" timestamp="1592393512539" />
......@@ -594,11 +608,12 @@
<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="930" height="191" key="GridCell.Tab.0.center/37.23.1883.1177@37.23.1883.1177" timestamp="1592385235054" />
<state width="1366" height="130" key="GridCell.Tab.0.left" timestamp="1592832798440">
<screen x="32" y="23" width="1888" height="1177" />
<state width="1366" height="130" key="GridCell.Tab.0.left" timestamp="1592900135142">
<screen x="31" y="23" width="1889" 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="1366" height="130" key="GridCell.Tab.0.left/32.23.1888.1177@32.23.1888.1177" timestamp="1592832798440" />
<state width="1366" height="130" key="GridCell.Tab.0.left/31.23.1889.1177@31.23.1889.1177" timestamp="1592900135142" />
<state width="1366" height="130" key="GridCell.Tab.0.left/32.23.1888.1177@32.23.1888.1177" timestamp="1592891542792" />
<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="930" height="191" key="GridCell.Tab.0.left/35.23.1885.1177@35.23.1885.1177" timestamp="1592393512538" />
......@@ -609,11 +624,12 @@
<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="930" height="191" key="GridCell.Tab.0.left/37.23.1883.1177@37.23.1883.1177" timestamp="1592385235054" />
<state width="1366" height="130" key="GridCell.Tab.0.right" timestamp="1592832798441">
<screen x="32" y="23" width="1888" height="1177" />
<state width="1366" height="130" key="GridCell.Tab.0.right" timestamp="1592900135143">
<screen x="31" y="23" width="1889" 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="1366" height="130" key="GridCell.Tab.0.right/32.23.1888.1177@32.23.1888.1177" timestamp="1592832798441" />
<state width="1366" height="130" key="GridCell.Tab.0.right/31.23.1889.1177@31.23.1889.1177" timestamp="1592900135143" />
<state width="1366" height="130" key="GridCell.Tab.0.right/32.23.1888.1177@32.23.1888.1177" timestamp="1592891542793" />
<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="930" height="191" key="GridCell.Tab.0.right/35.23.1885.1177@35.23.1885.1177" timestamp="1592393512539" />
......@@ -638,11 +654,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="514" y="313" key="Vcs.Push.Dialog.v2" timestamp="1592449550590">
<state x="514" y="313" key="Vcs.Push.Dialog.v2" timestamp="1592880319676">
<screen x="32" y="23" width="1888" 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="514" y="313" key="Vcs.Push.Dialog.v2/32.23.1888.1177@32.23.1888.1177" timestamp="1592449550590" />
<state x="514" y="313" key="Vcs.Push.Dialog.v2/32.23.1888.1177@32.23.1888.1177" timestamp="1592880319676" />
<state x="517" y="313" key="Vcs.Push.Dialog.v2/35.23.1885.1177@35.23.1885.1177" timestamp="1592373729832" />
<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" />
......@@ -669,12 +685,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="590" y="283" width="904" height="778" key="search.everywhere.popup" timestamp="1592830804212">
<screen x="32" y="23" width="1888" height="1177" />
<state x="589" y="283" width="905" height="778" key="search.everywhere.popup" timestamp="1592899600409">
<screen x="31" y="23" width="1889" 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="589" y="283" width="905" height="778" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1592899600409" />
<state x="2007" y="283" width="920" height="778" key="search.everywhere.popup/32.23.1408.877/1440.23.1920.1177@1440.23.1920.1177" timestamp="1592552467353" />
<state x="590" y="283" width="904" height="778" key="search.everywhere.popup/32.23.1888.1177@32.23.1888.1177" timestamp="1592830804212" />
<state x="590" y="283" width="904" height="778" key="search.everywhere.popup/32.23.1888.1177@32.23.1888.1177" timestamp="1592891486677" />
<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="1592374136123" />
......
mock/miniTb/qiaqiaHome.getGameInfo.json
View file @ dd7c7b58
{
"code": "000000",
"data": {
"guideStep": 8,
"guideIsEnd": true,
"guideStep": 0,
"guideIsEnd": false,
"waterDrops": 0,
"plants": [
{
......
src/Tools.ts
View file @ dd7c7b58
......@@ -87,7 +87,7 @@ export class Tool {
}
// cloud://21DC968488CF65B20EC98D34D07B7B9D//浇水动效.svga
const src = `cloud://21DC968488CF65B20EC98D34D07B7B9D//${name}.svga`;
const src = `cloud://5C68107E2545139A29BC2BA5EF618280//${name}.svga`;
// const src = `../svga/${name}.svga`; /// TODO 线上替换
SvgaParser.loadSvga(src, (v) => {
Tool.svgaCache[name] = v; // 做一个缓存
......
src/const/staticData.ts
View file @ dd7c7b58
......@@ -37,17 +37,17 @@ export const s_PlantData = {
CHESTNUT: {
key: PLANT_TYPE.CHESTNUT,
name: '板栗',
time: 1,
time: 6,
},
PECAN: {
key: PLANT_TYPE.PECAN,
name: '山核桃',
time: 2,
time: 4,
},
PEANUT: {
key: PLANT_TYPE.PEANUT,
name: '花生',
time: 3,
time: 6,
},
MELON: {
key: PLANT_TYPE.MELON,
......@@ -57,12 +57,12 @@ export const s_PlantData = {
PISTACHIONUT: {
key: PLANT_TYPE.PISTACHIONUT,
name: '开心果',
time: 5,
time: 4,
},
CASHEWNUT: {
key: PLANT_TYPE.CASHEWNUT,
name: '腰果',
time: 6,
time: 5,
},
}
......
src/scenes/GuideScene.ts
View file @ dd7c7b58
......@@ -36,13 +36,13 @@ export class GuideScene extends Scene {
});
// UI层
this.uiLayer = this.addChild(new UILayer());
// 游戏层
GameLayer.kill();
this.gameLayer = this.addChild(GameLayer.ins);
// UI层
this.uiLayer = this.addChild(new UILayer());
// 引导层
this.guideLayer = this.addChild(new GuideLayer());
}
......
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