Skip to content

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

guide

parent ec1680f1
Hide whitespace changes
Inline Side-by-side
Showing with 7924 additions and 160 deletions
.idea/workspace.xml
View file @ 43775945
......@@ -2,19 +2,35 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="31be0130-d27d-4740-b668-956a8050e1bf" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/mock/miniTb/qiaqia2.completeTask.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/mock/miniTb/qiaqia2.exchangeGoods.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/mock/miniTb/qiaqia2.getMyPrizeList.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/mock/miniTb/qiaqia2.receiveEnamePrize.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/mock/miniTb/qiaqiaHome.doNoviceGuide.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/exRecordPanel/record_dis.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/exRecordPanel/record_en.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/guidePanel/guide_bg.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/guidePanel/guide_btn.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/panels/GuidePanel.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/parts/Game/GuideLayer.ts" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/scenes/GuideScene.ts" 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.getExchangeGoodsList.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/qiaqia2.getExchangeGoodsList.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/qiaqia2.getTaskList.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/qiaqia2.getTaskList.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/module/ctrls/panelCtrl.ts" beforeDir="false" afterPath="$PROJECT_DIR$/module/ctrls/panelCtrl.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/qiaqia2.getMyPrizeList.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/qiaqia2.getMyPrizeList.json" 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$/output.js" beforeDir="false" afterPath="$PROJECT_DIR$/output.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/exRecordPanel/exRecordPanel.png" beforeDir="false" afterPath="$PROJECT_DIR$/released/resource/exRecordPanel/exRecordPanel.png" 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/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$/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/GEVENT.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/const/GEVENT.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/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/Land.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/parts/Game/Land.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/parts/Game/PlantList.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/parts/Game/PlantList.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/parts/UI/UILayer.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/parts/UI/UILayer.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" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -24,8 +40,8 @@
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="TypeScript File" />
<option value="JsonFile" />
<option value="TypeScript File" />
</list>
</option>
</component>
......@@ -46,7 +62,7 @@
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/libs" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/resource/guidePanel" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="nodejs_package_manager_path" value="npm" />
......@@ -54,13 +70,6 @@
<property name="ts.external.directory.path" value="$PROJECT_DIR$/node_modules/typescript/lib" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/libs" />
<recent name="$PROJECT_DIR$/mock/miniTb" />
<recent name="$PROJECT_DIR$/resource/svga" />
<recent name="$PROJECT_DIR$/resource/gameScene" />
<recent name="$PROJECT_DIR$/resource/exchangePanel" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/src" />
<recent name="$PROJECT_DIR$" />
......@@ -68,8 +77,15 @@
<recent name="$PROJECT_DIR$/resource/wareHouse" />
<recent name="$PROJECT_DIR$/resource/taskPanel" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/resource/guidePanel" />
<recent name="$PROJECT_DIR$/src/panels" />
<recent name="$PROJECT_DIR$/src/scenes" />
<recent name="$PROJECT_DIR$/resource/exRecordPanel" />
<recent name="$PROJECT_DIR$/libs" />
</key>
</component>
<component name="RunManager" selected="npm.dev">
<component name="RunManager" selected="npm.build">
<configuration name="build" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
<package-json value="$PROJECT_DIR$/package.json" />
<command value="run" />
......@@ -129,9 +145,9 @@
</list>
<recent_temporary>
<list>
<item itemvalue="npm.build" />
<item itemvalue="npm.dev" />
<item itemvalue="npm.flushRes" />
<item itemvalue="npm.build" />
<item itemvalue="npm.handleRes" />
<item itemvalue="npm.buildTS" />
</list>
......@@ -162,7 +178,7 @@
<workItem from="1591667441623" duration="25180000" />
<workItem from="1591753635902" duration="11045000" />
<workItem from="1591771023496" duration="19835000" />
<workItem from="1591840410673" duration="6340000" />
<workItem from="1591840410673" duration="32183000" />
</task>
<task id="LOCAL-00001" summary="1">
<created>1591003912929</created>
......@@ -409,7 +425,14 @@
<option name="project" value="LOCAL" />
<updated>1591794963629</updated>
</task>
<option name="localTasksCounter" value="36" />
<task id="LOCAL-00036" summary="111">
<created>1591846771403</created>
<option name="number" value="00036" />
<option name="presentableId" value="LOCAL-00036" />
<option name="project" value="LOCAL" />
<updated>1591846771404</updated>
</task>
<option name="localTasksCounter" value="37" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -427,7 +450,6 @@
</component>
<component name="VcsManagerConfiguration">
<option name="CHECK_NEW_TODO" value="false" />
<MESSAGE value="111" />
<MESSAGE value="task" />
<MESSAGE value="panel" />
<MESSAGE value="shop panel" />
......@@ -448,7 +470,8 @@
<MESSAGE value="任务弹窗" />
<MESSAGE value="res" />
<MESSAGE value="exchangePanel" />
<option name="LAST_COMMIT_MESSAGE" value="exchangePanel" />
<MESSAGE value="111" />
<option name="LAST_COMMIT_MESSAGE" value="111" />
</component>
<component name="WindowStateProjectService">
<state x="323" y="198" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1591790199346">
......@@ -459,55 +482,64 @@
<screen x="37" y="23" width="1643" height="1027" />
</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="467" y="108" key="CommitChangelistDialog2" timestamp="1591794962737">
<state x="467" y="108" key="CommitChangelistDialog2" timestamp="1591846770902">
<screen x="37" y="23" width="1643" height="1027" />
</state>
<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="467" y="108" key="CommitChangelistDialog2/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591794962737" />
<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 width="252" height="907" key="GridCell.Tab.0.bottom" timestamp="1591794971568">
<screen x="37" y="23" width="1643" height="1027" />
<state width="798" height="117" key="GridCell.Tab.0.bottom" timestamp="1591875978496">
<screen x="0" y="23" width="1920" height="1177" />
</state>
<state width="798" height="117" key="GridCell.Tab.0.bottom/0.23.1920.1177@0.23.1920.1177" timestamp="1591875978496" />
<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="252" height="1057" key="GridCell.Tab.0.bottom/37.23.1403.877/1440.-199.1920.1177@1440.-199.1920.1177" timestamp="1591854408198" />
<state width="469" height="697" key="GridCell.Tab.0.bottom/37.23.1643.1027/1680.-199.1920.1177@1680.-199.1920.1177" timestamp="1591778250578" />
<state width="252" height="907" key="GridCell.Tab.0.bottom/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591794971568" />
<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="252" height="907" key="GridCell.Tab.0.center" timestamp="1591794971567">
<screen x="37" y="23" width="1643" height="1027" />
<state width="798" height="117" key="GridCell.Tab.0.center" timestamp="1591875978496">
<screen x="0" y="23" width="1920" height="1177" />
</state>
<state width="798" height="117" key="GridCell.Tab.0.center/0.23.1920.1177@0.23.1920.1177" timestamp="1591875978496" />
<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="252" height="1057" key="GridCell.Tab.0.center/37.23.1403.877/1440.-199.1920.1177@1440.-199.1920.1177" timestamp="1591854408196" />
<state width="469" height="697" key="GridCell.Tab.0.center/37.23.1643.1027/1680.-199.1920.1177@1680.-199.1920.1177" timestamp="1591778250577" />
<state width="252" height="907" key="GridCell.Tab.0.center/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591794971567" />
<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="252" height="907" key="GridCell.Tab.0.left" timestamp="1591794971566">
<screen x="37" y="23" width="1643" height="1027" />
<state width="798" height="117" key="GridCell.Tab.0.left" timestamp="1591875978495">
<screen x="0" y="23" width="1920" height="1177" />
</state>
<state width="798" height="117" key="GridCell.Tab.0.left/0.23.1920.1177@0.23.1920.1177" timestamp="1591875978495" />
<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="252" height="1057" key="GridCell.Tab.0.left/37.23.1403.877/1440.-199.1920.1177@1440.-199.1920.1177" timestamp="1591854408195" />
<state width="469" height="697" key="GridCell.Tab.0.left/37.23.1643.1027/1680.-199.1920.1177@1680.-199.1920.1177" timestamp="1591778250577" />
<state width="252" height="907" key="GridCell.Tab.0.left/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591794971566" />
<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="252" height="907" key="GridCell.Tab.0.right" timestamp="1591794971567">
<screen x="37" y="23" width="1643" height="1027" />
<state width="798" height="117" key="GridCell.Tab.0.right" timestamp="1591875978496">
<screen x="0" y="23" width="1920" height="1177" />
</state>
<state width="798" height="117" key="GridCell.Tab.0.right/0.23.1920.1177@0.23.1920.1177" timestamp="1591875978496" />
<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="252" height="1057" key="GridCell.Tab.0.right/37.23.1403.877/1440.-199.1920.1177@1440.-199.1920.1177" timestamp="1591854408196" />
<state width="469" height="697" key="GridCell.Tab.0.right/37.23.1643.1027/1680.-199.1920.1177@1680.-199.1920.1177" timestamp="1591778250577" />
<state width="252" height="907" key="GridCell.Tab.0.right/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591794971567" />
<state width="252" height="907" key="GridCell.Tab.0.right/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591852525605" />
<state width="311" height="907" key="GridCell.Tab.0.right/37.23.1643.1027@37.23.1643.1027" timestamp="1591713871413" />
<state x="446" y="278" key="IDE.errors.dialog" timestamp="1591150813027">
<screen x="37" y="23" width="1643" height="1027" />
<state x="478" y="315" key="IDE.errors.dialog" timestamp="1591875133535">
<screen x="0" y="23" width="1920" height="1177" />
</state>
<state x="478" y="315" key="IDE.errors.dialog/0.23.1920.1177@0.23.1920.1177" timestamp="1591875133535" />
<state x="446" y="278" key="IDE.errors.dialog/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591150813027" />
<state x="615" y="245" key="RollbackChangesDialog" timestamp="1591077661188">
<screen x="37" y="23" width="1643" height="1027" />
</state>
<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="457" y="276" key="Vcs.Push.Dialog.v2" timestamp="1591794965631">
<state x="457" y="276" key="Vcs.Push.Dialog.v2" timestamp="1591846773289">
<screen x="37" y="23" width="1643" height="1027" />
</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="457" y="276" key="Vcs.Push.Dialog.v2/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591794965631" />
<state x="457" y="276" key="Vcs.Push.Dialog.v2/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591846773289" />
<state x="417" y="141" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1591269112575">
<screen x="37" y="23" width="1643" height="1027" />
</state>
......@@ -524,12 +556,18 @@
<screen x="35" y="23" width="1645" height="1027" />
</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="523" y="250" width="670" height="676" key="search.everywhere.popup" timestamp="1591846627265">
<screen x="37" y="23" width="1643" height="1027" />
<state x="85" y="286" key="run.anything.popup" timestamp="1591874864015">
<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="1591874864015" />
<state x="568" y="283" width="917" height="776" key="search.everywhere.popup" timestamp="1591875348844">
<screen x="0" y="23" width="1920" 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="1591875348844" />
<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="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" />
<state x="2248" y="61" width="783" height="775" key="search.everywhere.popup/37.23.1643.1027/1680.-199.1920.1177@1680.-199.1920.1177" timestamp="1591778463158" />
<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="1591846627265" />
<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="1591847016842" />
<state x="523" y="250" width="670" height="676" key="search.everywhere.popup/37.23.1643.1027@37.23.1643.1027" timestamp="1591780279349" />
</component>
</project>
\ No newline at end of file
mock/miniTb/qiaqia2.getMyPrizeList.json
View file @ 43775945
......@@ -4,7 +4,7 @@
{
"image": "https://source.unsplash.com/user/erondu/250x250",
"amount": 20,
"drawStatus": 4,
"drawStatus": 3,
"openId": "AAEAuNyCAKrpWdzBzedO22-F",
"remark": "订购应用已过期，请联系商家处理",
"updateTime": 1591775841679,
......
mock/miniTb/qiaqia2.receiveEnamePrize.json 0 → 100644
View file @ 43775945
{
"success": true,
"message": "ok",
"data": true
}
mock/miniTb/qiaqiaHome.doNoviceGuide.json 0 → 100644
View file @ 43775945
{
"success":true,
"data":{
"guideIsEnd":false,
"guideStep":3,
"waterDrops":100,
"plants":[
{
"index":1,
"plant":false,
"level":"",
"plantType":"",
"waterTime":"",
"waterRestCount":""
},
{
"index":2,
"plant":true,
"level":1,
"plantType":"PEANUT",
"waterTime":5000,
"waterRestCount":1,
"totalTime":5000
},
{
"index":3,
"plant":false,
"level":"",
"plantType":"",
"waterTime":"",
"waterRestCount":""
},
{
"index":4,
"plant":false,
"level":"",
"plantType":"",
"waterTime":"",
"waterRestCount":""
}
]
}
}
mock/miniTb/qiaqiaHome.getGameInfo.json
View file @ 43775945
......@@ -2,12 +2,12 @@
"success": true,
"data": {
"guideIsEnd": false,
"guideStep": 3,
"guideStep": 1,
"waterDrops": 100,
"plants": [
{
"index": 1,
"plant": true,
"plant": false,
"level": 3,
"plantType": "PEANUT",
"waterTime": 1591891173326,
......@@ -16,7 +16,7 @@
},
{
"index": 2,
"plant": true,
"plant": false,
"level": 1,
"plantType": "CASHEWNUT",
"waterTime": 1591891173326,
......@@ -25,7 +25,7 @@
},
{
"index": 3,
"plant": true,
"plant": false,
"level": 1,
"plantType": "PECAN",
"waterTime": 1591891173326,
......
output.js
View file @ 43775945
This source diff could not be displayed because it is too large. You can view the blob instead.
released/resource/res.json
View file @ 43775945
......@@ -6330,9 +6330,31 @@
}
},
{
"keys": "record_icon.png,record_item_bg.png",
"keys": "record_dis.png,record_en.png,record_icon.png,record_item_bg.png",
"name": "exRecordPanel",
"atlas": {
"record_dis.png": {
"x": 851,
"y": 70,
"w": 129,
"h": 66,
"ox": 0,
"oy": 0,
"sw": 129,
"sh": 66,
"ro": false
},
"record_en.png": {
"x": 851,
"y": 2,
"w": 129,
"h": 66,
"ox": 0,
"oy": 0,
"sw": 129,
"sh": 66,
"ro": false
},
"record_icon.png": {
"x": 657,
"y": 2,
......@@ -6425,7 +6447,7 @@
}
},
{
"keys": "btn_仓库.png,btn_兑换记录.png,btn_商店.png,btn_规则.png,btn_领水滴.png,game_bg.jpg,广告.png,用户_bg.png,用户_头像.png,用户_水.png,田_初始.png,田_种植.png,田_选择.png,种植框_bg.png,种植框_left.png,种植框_right.png,种植框_time_bg.png,种植框_山核桃.png,种植框_开心果.png,种植框_板栗.png,种植框_瓜子.png,种植框_腰果.png,种植框_花生.png,袋子.png,进度_bg.png,进度_fill.png",
"keys": "btn_仓库.png,btn_兑换记录.png,btn_商店.png,btn_规则.png,btn_领水滴.png,game_bg.jpg,广告.png,用户_bg.png,用户_头像.png,用户_水.png,田_初始.png,田_种植.png,田_选择.png,种植框_bg.png,种植框_left.png,种植框_right.png,种植框_time_bg.png,种植框_开心果.png,种植框_板栗.png,种植框_核桃.png,种植框_瓜子.png,种植框_腰果.png,种植框_花生.png,袋子.png,进度_bg.png,进度_fill.png",
"name": "gameScene",
"atlas": {
"btn_仓库.png": {
......@@ -6604,17 +6626,6 @@
"sh": 34,
"ro": false
},
"种植框_山核桃.png": {
"x": 957,
"y": 367,
"w": 35,
"h": 44,
"ox": 0,
"oy": 0,
"sw": 35,
"sh": 44,
"ro": true
},
"种植框_开心果.png": {
"x": 448,
"y": 470,
......@@ -6637,6 +6648,17 @@
"sh": 41,
"ro": false
},
"种植框_核桃.png": {
"x": 957,
"y": 367,
"w": 35,
"h": 44,
"ox": 0,
"oy": 0,
"sw": 35,
"sh": 44,
"ro": true
},
"种植框_瓜子.png": {
"x": 950,
"y": 461,
......@@ -6705,6 +6727,34 @@
}
}
},
{
"keys": "guide_bg.png,guide_btn.png",
"name": "guidePanel",
"atlas": {
"guide_bg.png": {
"x": 2,
"y": 2,
"w": 738,
"h": 804,
"ox": 5,
"oy": 410,
"sw": 750,
"sh": 1624,
"ro": false
},
"guide_btn.png": {
"x": 2,
"y": 808,
"w": 400,
"h": 76,
"ox": 0,
"oy": 0,
"sw": 400,
"sh": 76,
"ro": false
}
}
},
{
"keys": "loading_bg.jpg,loading_per_bg.png,loading_per_fill.png,loading_title.png,loading_绳子.png",
"name": "loadingScene",
......@@ -6960,7 +7010,7 @@
}
},
{
"keys": "wareHouse_icon.png,wareHouse_item_bg.png,wareHouse_山核桃.png,wareHouse_开心果.png,wareHouse_板栗.png,wareHouse_瓜子.png,wareHouse_腰果.png,wareHouse_花生.png",
"keys": "wareHouse_icon.png,wareHouse_item_bg.png,wareHouse_开心果.png,wareHouse_板栗.png,wareHouse_核桃.png,wareHouse_瓜子.png,wareHouse_腰果.png,wareHouse_花生.png",
"name": "wareHouse",
"atlas": {
"wareHouse_icon.png": {
......@@ -6985,17 +7035,6 @@
"sh": 328,
"ro": false
},
"wareHouse_山核桃.png": {
"x": 316,
"y": 2,
"w": 140,
"h": 164,
"ox": 0,
"oy": 0,
"sw": 140,
"sh": 164,
"ro": false
},
"wareHouse_开心果.png": {
"x": 458,
"y": 156,
......@@ -7018,6 +7057,17 @@
"sh": 152,
"ro": false
},
"wareHouse_核桃.png": {
"x": 316,
"y": 2,
"w": 140,
"h": 164,
"ox": 0,
"oy": 0,
"sw": 140,
"sh": 164,
"ro": false
},
"wareHouse_瓜子.png": {
"x": 458,
"y": 308,
......
resource/res.json
View file @ 43775945
......@@ -77,7 +77,7 @@
"name": "common"
},
{
"keys": "record_icon.png,record_item_bg.png",
"keys": "record_dis.png,record_en.png,record_icon.png,record_item_bg.png",
"name": "exRecordPanel"
},
{
......@@ -92,6 +92,10 @@
"keys": "btn_仓库.png,btn_兑换记录.png,btn_商店.png,btn_规则.png,btn_领水滴.png,game_bg.jpg,广告.png,用户_bg.png,用户_头像.png,用户_水.png,田_初始.png,田_种植.png,田_选择.png,种植框_bg.png,种植框_left.png,种植框_right.png,种植框_time_bg.png,种植框_开心果.png,种植框_板栗.png,种植框_核桃.png,种植框_瓜子.png,种植框_腰果.png,种植框_花生.png,袋子.png,进度_bg.png,进度_fill.png",
"name": "gameScene"
},
{
"keys": "guide_bg.png,guide_btn.png",
"name": "guidePanel"
},
{
"keys": "loading_bg.jpg,loading_per_bg.png,loading_per_fill.png,loading_title.png,loading_绳子.png",
"name": "loadingScene"
......@@ -117,7 +121,7 @@
"name": "taskPanel"
},
{
"keys": "wareHouse_icon.png,wareHouse_item_bg.png,wareHouse_山核桃.png,wareHouse_开心果.png,wareHouse_板栗.png,wareHouse_瓜子.png,wareHouse_腰果.png,wareHouse_花生.png",
"keys": "wareHouse_icon.png,wareHouse_item_bg.png,wareHouse_开心果.png,wareHouse_板栗.png,wareHouse_核桃.png,wareHouse_瓜子.png,wareHouse_腰果.png,wareHouse_花生.png",
"name": "wareHouse"
}
],
......
src/ResJson.ts
View file @ 43775945
This source diff could not be displayed because it is too large. You can view the blob instead.
src/TaoBaoNet.ts
View file @ 43775945
......@@ -41,8 +41,12 @@ export enum TbNetName {
exchangeGoods = 'qiaqia2.exchangeGoods',
receiveEname = 'qiaqia2.receiveEnamePrize',
getMyPrizeList = 'qiaqia2.getMyPrizeList',
guide = 'qiaqiaHome.doNoviceGuide',
// 游戏信息
gameInfo = 'qiaqiaHome.getGameInfo',
......
src/const/GEVENT.ts
View file @ 43775945
export enum G_EVENT {
GET_WAREHOUSE = 'getWareHouse',
GET_SHOPLIST = 'getShopList'
GET_SHOPLIST = 'getShopList',
GET_MY_PRIZE_LIST = 'getMyPrizeList',
GET_TASK_LIST = 'getTaskList',
GUIDE2_PLANT = 'guide2Plant',
GUIDE1 = 'guide1',
GUIDE2 = 'guide2',
GUIDE3 = 'guide3',
GUIDE4 = 'guide4',
GUIDE5 = 'guide5',
GUIDE7 = 'guide7',
GUIDE8 = 'guide8',
GUIDE9 = 'guide9',
GUIDE10 = 'guide10',
}
src/panels/ExRecordPanel.ts
View file @ 43775945
......@@ -2,6 +2,7 @@ import { Panel } from "../../module/views/Panel";
import { Tool } from "../Tools";
import { layers } from "../../module/views/layers";
import { activityId, sendTbNet, TbNetName } from "../TaoBaoNet";
import { RES } from "../../module/RES";
import Sprite = FYGE.Sprite;
import Tween = FYGE.Tween;
import ScrollList = FYGE.ScrollList;
......@@ -11,6 +12,12 @@ import Texture = FYGE.Texture;
import Graphics = FYGE.Graphics;
import TextField = FYGE.TextField;
import Ease = FYGE.Ease;
import TEXT_ALIGN = FYGE.TEXT_ALIGN;
import TEXT_lINETYPE = FYGE.TEXT_lINETYPE;
import MouseEvent = FYGE.MouseEvent;
import { showToast } from "../../module/ctrls";
import { GDispatcher } from "../Main";
import { G_EVENT } from "../const/GEVENT";
export default class ExRecordPanel extends Panel {
get groupNames() {
......@@ -32,7 +39,14 @@ export default class ExRecordPanel extends Panel {
this.scroll = this.addChild(new ScrollList(RecordItem, 653, 200, 653, 830));
this.scroll.position.set((this.width - this.scroll.width) / 2, 210);
}
start(data) {
super.start();
GDispatcher.dispatchEvent(G_EVENT.GET_MY_PRIZE_LIST);
}
private getMyPrizeList() {
sendTbNet(TbNetName.getMyPrizeList, {
activityId: activityId
}, (success, res) => {
......@@ -64,33 +78,71 @@ export default class ExRecordPanel extends Panel {
});
}
start(data) {
super.start();
}
initEvents() {
this.closeBtn.addEventListener(FYGE.MouseEvent.CLICK, this.hidePanel, this)
this.closeBtn.addEventListener(FYGE.MouseEvent.CLICK, this.hidePanel, this);
GDispatcher.addEventListener(G_EVENT.GET_MY_PRIZE_LIST, this.getMyPrizeList, this);
GDispatcher.addEventListener('onShow', this.getMyPrizeList, this);
}
removeEvents() {
this.closeBtn.removeEventListener(FYGE.MouseEvent.CLICK, this.hidePanel, this)
this.closeBtn.removeEventListener(FYGE.MouseEvent.CLICK, this.hidePanel, this);
GDispatcher.removeEventListener(G_EVENT.GET_MY_PRIZE_LIST, this.getMyPrizeList, this);
GDispatcher.removeEventListener('onShow', this.getMyPrizeList, this);
}
}
class RecordItem extends Container implements IScrollListItem {
public data: number;
public data: any;
public id: number;
private prizeImg: Sprite;
private prizeName: TextField;
private prizeDate: TextField;
private remark: TextField;
private btn: Sprite;
public initData(id: number, data: any): void {
if (!data) return;
this.data = data;
this.prizeImg.texture = Texture.fromUrl(data.image);
this.prizeName.text = data.name;
this.prizeDate.text = `${data.exchangeDay}兑换`;
if (data.drawStatus == 4 || data.drawStatus == 6) {
this.remark.visible = true;
this.remark.text = data.remark;
} else {
this.remark.visible = false;
}
this.btn.removeAllEventListener();
if (data.drawStatus == 1 || data.drawStatus == 4 || data.drawStatus == 6) {
this.btn.texture = RES.getRes('record_en.png');
this.btn.addEventListener(MouseEvent.CLICK, () => {
if (this.data.type == 1) {
/// todo 权益
sendTbNet(TbNetName.receiveEname, {
_id: this.data._id,
activityId: activityId
}, (success, res) => {
if (!success || !res || !res.data) {
showToast('领取异常，请稍后重试');
return;
}
GDispatcher.dispatchEvent(G_EVENT.GET_MY_PRIZE_LIST);
});
} else if (this.data.type == 3) {
// todo 实物
}
}, this);
} else {
this.btn.texture = RES.getRes('record_dis.png');
}
}
constructor() {
......@@ -111,6 +163,16 @@ class RecordItem extends Container implements IScrollListItem {
this.prizeDate = this.addChild(Tool.getText('', 22, '#999999'));
this.prizeDate.position.set(176, 91);
// this.prizeDate.visible = false;
this.remark = this.addChild(Tool.getText('', 22, '#ff0000'));
this.remark.textWidth = this.width - 20;
this.remark.textAlign = TEXT_ALIGN.RIGHT;
this.remark.lineType = TEXT_lINETYPE.MULTI;
this.remark.y = 130;
this.btn = this.addChild(Tool.getSprite('record_en.png'));
this.btn.position.set(500, (this.height - this.btn.height) / 2);
}
}
src/panels/GuidePanel.ts 0 → 100644
View file @ 43775945
import { Panel } from "../../module/views/Panel";
import { Tool } from "../Tools";
import { activityId, sendTbNet, TbNetName } from "../TaoBaoNet";
import Sprite = FYGE.Sprite;
import TextField = FYGE.TextField;
import MouseEvent = FYGE.MouseEvent;
import { showToast } from "../../module/ctrls";
import { GDispatcher } from "../Main";
import { G_EVENT } from "../const/GEVENT";
export default class GuidePanel extends Panel {
get groupNames() {
return ["guidePanel"];
}
closeBtn: Sprite;
numLabel: TextField;
btn: Sprite;
initUi() {
this.addChild(Tool.getSprite("guide_bg.png"))
.position.set(0, -130);
this.numLabel = this.addChild(Tool.getText('+3', 28, '#c05413'));
this.numLabel.position.set(414, 765);
this.btn = this.addChild(Tool.getSprite('guide_btn.png'));
this.btn.position.set((this.width - this.btn.width) / 2, 939);
}
start(data) {
super.start();
}
private guide1() {
sendTbNet(TbNetName.guide, {
activityId: activityId,
index: 1,
}, (success, res) => {
if (!success) {
return;
}
if (!res.data) {
showToast('请稍后再试');
}
GDispatcher.dispatchEvent(G_EVENT.GUIDE2);
this.hidePanel();
});
}
initEvents() {
this.btn.addEventListener(MouseEvent.CLICK, this.guide1, this);
}
removeEvents() {
this.btn.removeEventListener(MouseEvent.CLICK, this.guide1, this);
}
}
src/panels/TaskPanel.ts
View file @ 43775945
......@@ -12,6 +12,8 @@ import TextField = FYGE.TextField;
import MouseEvent = FYGE.MouseEvent;
import Ease = FYGE.Ease;
import { showToast } from "../../module/ctrls";
import { GDispatcher } from "../Main";
import { G_EVENT } from "../const/GEVENT";
const TASK_TYPE = {
sign: 'sign',
......@@ -46,27 +48,6 @@ export default class TaskPanel extends Panel {
this.scroll = this.addChild(new ScrollList(TaskItem, 654, 200, 654, 830));
this.scroll.position.set((this.width - this.scroll.width) / 2, 210);
sendTbNet(TbNetName.taskList, {
activityId: activityId
}, (success, res) => {
if (!success) {
return;
}
const a = [
'member',
'follow',
'joinGroup',
];
let data = [];
for (let i = 0; i < res.data.length; i++) {
if (a.indexOf(res.data[i].taskType) > -1 && res.data[i].todayCompleteTimes >= res.data[i].times) {
continue;
}
data.push(res.data[i]);
}
this.scroll.updateData(data);
});
}
public showAni() {
......@@ -92,16 +73,40 @@ export default class TaskPanel extends Panel {
});
}
private getTaskList() {
sendTbNet(TbNetName.taskList, {
activityId: activityId
}, (success, res) => {
if (!success) {
return;
}
const a = ['member', 'follow', 'joinGroup'];
let data = [];
for (let i = 0; i < res.data.length; i++) {
if (a.indexOf(res.data[i].taskType) > -1 && res.data[i].todayCompleteTimes >= res.data[i].times) {
continue;
}
data.push(res.data[i]);
}
this.scroll.updateData(data);
});
}
start(data) {
super.start();
GDispatcher.dispatchEvent(G_EVENT.GET_TASK_LIST);
}
initEvents() {
this.closeBtn.addEventListener(FYGE.MouseEvent.CLICK, this.hidePanel, this)
this.closeBtn.addEventListener(FYGE.MouseEvent.CLICK, this.hidePanel, this);
GDispatcher.addEventListener(G_EVENT.GET_TASK_LIST, this.getTaskList, this);
GDispatcher.addEventListener('onShow', this.getTaskList, this);
}
removeEvents() {
this.closeBtn.removeEventListener(FYGE.MouseEvent.CLICK, this.hidePanel, this)
this.closeBtn.removeEventListener(FYGE.MouseEvent.CLICK, this.hidePanel, this);
GDispatcher.removeEventListener(G_EVENT.GET_TASK_LIST, this.getTaskList, this);
GDispatcher.removeEventListener('onShow', this.getTaskList, this);
}
}
......@@ -181,10 +186,10 @@ class TaskItem extends Container implements IScrollListItem {
}
sendTbNet(TbNetName.completeTask, {
taskType:data.taskType,
taskType: data.taskType,
activityId: activityId
}, (success, res) => {
if(!success || !res || !res.data){
if (!success || !res || !res.data) {
showToast('网络异常，请稍后重试');
return;
}
......
src/parts/Game/GameLayer.ts
View file @ 43775945
......@@ -21,11 +21,14 @@ export default class GameLayer extends Container {
public static get ins(): GameLayer {
return GameLayer._ins || (GameLayer._ins = new GameLayer());
}
public static kill(){
GameLayer._ins && GameLayer._ins.destroy();
GameLayer._ins = null; // 一定要清除单例
}
public destroy() {
super.destroy();
this.removeEvent();
GameLayer._ins = null; // 一定要清除单例
}
private landList: Land[] = []; // 土地列表
......@@ -51,6 +54,7 @@ export default class GameLayer extends Container {
* @param {PLANT_TYPE} type 植物类型
*/
public addPlant(landId: number, type: PLANT_TYPE) {
console.log('请求种植接口');
sendTbNet(TbNetName.plant, {
landIndex: landId,
activityId: activityId,
......
src/parts/Game/GuideLayer.ts 0 → 100644
View file @ 43775945
import Container = FYGE.Container;
import Tween = FYGE.Tween;
import MouseEvent = FYGE.MouseEvent;
import MovieClip = FYGE.MovieClip;
import Event = FYGE.Event;
import TextField = FYGE.TextField;
import Sprite = FYGE.Sprite;
import { G_EVENT } from "../../const/GEVENT";
import { GDispatcher } from "../../Main";
import PlantList from "./PlantList";
import { Land } from "./Land";
import { activityId, getTbData, sendTbNet, setTbData, TbNetName } from "../../TaoBaoNet";
import { showToast } from "../../../module/ctrls";
import { OPTION_TYPE } from "../../const/staticData";
import { Tool } from "../../Tools";
import { getAdjustBottomHeight } from "../../const/myLab";
import PanelCtrl from "../../../module/ctrls/panelCtrl";
import { GameScene } from "../../scenes/GameScene";
import SceneCtrl from "../../../module/ctrls/sceneCtrl";
export default class GuideLayer extends Container {
private guide2: Container;
private land2: Land;
private guide2Text: TextField;
private plantList: PlantList;
private guide3: Container;
private guide3Text: TextField;
private guide4: Container;
private guide4Text: TextField;
private guide5: Container;
private guide5Text: TextField;
private guide6: Container;
private guide6Text: TextField;
private taskBtn: Sprite;
private guide7: Container;
private guide7Text: TextField;
private wareHouseBtn: Sprite;
private guide8: Container;
private guide8Text: TextField;
private storeBtn: Sprite;
private guide9: Container;
private guide10: Container;
private bg;
private curGuide: Container;
constructor() {
super();
this.bg = this.addChild(new FYGE.Graphics());
this.bg.beginFill(0, 1);
this.bg.drawRect(0, 0, 750, 1624);
this.bg.endFill();
this.bg.alpha = 0;
this.guide2 = this.addChild(new Container());
this.guide2.visible = false;
this.guide2.alpha = 0;
this.guide2Text = this.guide2.addChild(Tool.getText('点击空土地，开始种植吧', 28, '#ffffff'));
this.guide2Text.position.set((750 - this.guide2Text.textWidth) / 2, (1624 - this.guide2Text.textHeight) / 2 - 20);
this.guide3 = this.addChild(new Container());
this.guide3.visible = false;
this.guide3.alpha = 0;
this.guide3Text = this.guide3.addChild(Tool.getText('种下种子之后，别忘记浇水哦\n勤浇水，小苗才能快快长大哦', 28, '#ffffff'));
this.guide3Text.position.set((750 - this.guide3Text.textWidth) / 2, (1624 - this.guide3Text.textHeight) / 2 - 50);
this.guide4 = this.addChild(new Container());
this.guide4.visible = false;
this.guide4.alpha = 0;
this.guide4Text = this.guide4.addChild(Tool.getText('长成小树啦，快来再浇浇水吧', 28, '#ffffff'));
this.guide4Text.position.set((750 - this.guide4Text.textWidth) / 2, (1624 - this.guide4Text.textHeight) / 2 - 50);
this.guide5 = this.addChild(new Container());
this.guide5.visible = false;
this.guide5.alpha = 0;
this.guide5Text = this.guide5.addChild(Tool.getText('果子成熟啦，快来收取吧', 28, '#ffffff'));
this.guide5Text.position.set((750 - this.guide5Text.textWidth) / 2, (1624 - this.guide5Text.textHeight) / 2 - 50);
this.guide6 = this.addChild(new Container());
this.taskBtn = this.guide6.addChild(Tool.getSprite('btn_领水滴.png'));
this.taskBtn.x = 750 / 6 - this.taskBtn.width / 2;
this.taskBtn.y = getAdjustBottomHeight(this.taskBtn, (1624 - 1382 - 133) / 1624);
this.guide6.visible = false;
this.guide6.alpha = 0;
this.guide6Text = this.guide6.addChild(Tool.getText('每天去做任务还可以获得更多的水滴哦', 28, '#ffffff'));
this.guide6Text.position.set((750 - this.guide6Text.textWidth) / 2, (1624 - this.guide6Text.textHeight) / 2 - 50);
this.guide7 = this.addChild(new Container());
this.wareHouseBtn = this.guide7.addChild(Tool.getSprite('btn_仓库.png'));
this.wareHouseBtn.x = 750 / 2 - this.wareHouseBtn.width / 2;
this.wareHouseBtn.y = getAdjustBottomHeight(this.wareHouseBtn, (1624 - 1382 - 133) / 1624);
this.guide7.visible = false;
this.guide7.alpha = 0;
this.guide7Text = this.guide7.addChild(Tool.getText('收获的果实都会存储在这里哦', 28, '#ffffff'));
this.guide7Text.position.set((750 - this.guide7Text.textWidth) / 2, (1624 - this.guide7Text.textHeight) / 2 - 50);
this.guide8 = this.addChild(new Container());
this.storeBtn = this.guide8.addChild(Tool.getSprite('btn_商店.png'));
this.storeBtn.x = 750 / 6 * 5 - this.storeBtn.width / 2;
this.storeBtn.y = getAdjustBottomHeight(this.storeBtn, (1624 - 1382 - 133) / 1624);
this.guide8.visible = false;
this.guide8.alpha = 0;
this.guide8Text = this.guide8.addChild(Tool.getText('有足够的果实，就可以在这里兑换\n超值好礼哦，快去多多种植吧', 28, '#ffffff'));
this.guide8Text.position.set((750 - this.guide8Text.textWidth) / 2, (1624 - this.guide8Text.textHeight) / 2 - 50);
this.land2 = this.addChild(new Land());
this.land2.removeAllEventListener();
this.land2.position.set(334, 875);
this.land2.progressBar.removeAllEventListener();
this.plantList = this.addChild(new PlantList(true));
}
start() {
const gameInfo: any = getTbData(TbNetName.gameInfo).data;
const guideStep = gameInfo.guideStep;
if (guideStep < 2) {
this.land2.once(MouseEvent.CLICK, () => {
this.plantList.show(2);
this.guide2Text.text = '点击选择种子种下你的坚果';
});
}
for (let i = 0; i < gameInfo.plants.length; i++) {
if (gameInfo.plants[i].index == 2) {
this.land2.initPlant(gameInfo.plants[i]);
break;
}
}
if (guideStep >= 1) {
this[`showGuide${guideStep + 1}`]();
}
}
private hideBg() {
Tween.removeTweens(this.bg);
Tween.get(this.bg)
.to({alpha: 0}, 350);
Tween.get(this.curGuide)
.to({alpha: 0}, 350)
.set({visible: false, alpha: 0});
}
private showBg() {
Tween.removeTweens(this.bg);
Tween.get(this.bg)
.set({alpha: 0})
.to({alpha: 0.7}, 350);
}
// 种
private showGuide2() {
console.warn(1);
this.curGuide = this.guide2;
this.showBg();
this.land2.addOption(OPTION_TYPE.PLANT);
Tween.get(this.guide2)
.set({visible: true, alpha: 0})
.to({alpha: 1}, 350);
}
// 第一次浇水
private showGuide3() {
this.curGuide = this.guide3;
this.showBg();
let water = this.land2.addOption(OPTION_TYPE.WATER);
water.removeAllEventListener();
water.addEventListener(MouseEvent.CLICK, () => {
sendTbNet(TbNetName.guide, {
activityId: activityId,
index: 3
}, (success, res) => {
if (!success) return;
Tool.getSvga('浇水动效').then((mv: MovieClip) => {
this.land2.addChild(mv);
mv.position.set(50, -230);
mv.addEventListener(Event.END_FRAME, () => {
mv.stop();
this.land2.removeChild(mv);
this.guide3Text.text = '浇完水，要等小苗吸收一段时间，\n才能继续浇水哦';
for (let i = 0; i < res.data.plants.length; i++) {
if (res.data.plants[i].index == 2) {
this.land2.updatePlant(res.data.plants[i]);
this.land2.progressBar.once('endTime', () => {
this.showGuide4();
});
break;
}
}
});
this.land2.removeOption();
GDispatcher.dispatchEvent('getWater');
mv.gotoAndPlay(0, true);
});
});
});
Tween.get(this.guide3)
.set({visible: true, alpha: 0})
.to({alpha: 1}, 350);
}
// 第二次浇水
private showGuide4() {
this.guide3.visible = false;
this.curGuide = this.guide4;
let water = this.land2.addOption(OPTION_TYPE.WATER);
water.removeAllEventListener();
water.addEventListener(MouseEvent.CLICK, () => {
sendTbNet(TbNetName.guide, {
activityId: activityId,
index: 4
}, (success, res) => {
if (!success) return;
Tool.getSvga('浇水动效').then((mv: MovieClip) => {
this.land2.addChild(mv);
mv.position.set(50, -230);
mv.addEventListener(Event.END_FRAME, () => {
mv.stop();
this.land2.removeChild(mv);
for (let i = 0; i < res.data.plants.length; i++) {
if (res.data.plants[i].index == 2) {
this.hideBg();
this.land2.updatePlant(res.data.plants[i]);
this.land2.progressBar.once('endTime', () => {
this.showGuide5();
});
break;
}
}
});
this.land2.removeOption();
GDispatcher.dispatchEvent('getWater');
mv.gotoAndPlay(0, true);
});
});
});
Tween.get(this.guide4)
.set({visible: true, alpha: 0})
.to({alpha: 1}, 350);
}
// 收获
private showGuide5() {
this.guide4.visible = false;
this.curGuide = this.guide5;
this.showBg();
let get = this.land2.addOption(OPTION_TYPE.GET);
get.removeAllEventListener();
get.addEventListener(MouseEvent.CLICK, () => {
sendTbNet(TbNetName.guide, {
activityId: activityId,
index: 5
}, (success, res) => {
if (!success) return;
this.land2.removeOption();
this.land2.clearPlant();
this.showGuide6();
});
});
Tween.get(this.guide5)
.set({visible: true, alpha: 0})
.to({alpha: 1}, 350);
}
// 任务
private showGuide6() {
this.guide5.visible = false;
this.curGuide = this.guide6;
this.land2 && this.removeChild(this.land2);
this.showBg();
Tween.get(this.guide6)
.set({visible: true, alpha: 0})
.to({alpha: 1}, 350);
this.taskBtn.once(MouseEvent.CLICK, () => {
sendTbNet(TbNetName.guide, {
activityId: activityId,
index: 5
}, (success, res) => {
if (!success) return;
this.showGuide7();
});
});
}
// 仓库
private showGuide7() {
this.guide6.visible = false;
this.curGuide = this.guide7;
this.land2 && this.removeChild(this.land2);
this.showBg();
Tween.get(this.guide7)
.set({visible: true, alpha: 0})
.to({alpha: 1}, 350);
this.wareHouseBtn.once(MouseEvent.CLICK, () => {
sendTbNet(TbNetName.guide, {
activityId: activityId,
index: 5
}, (success, res) => {
if (!success) return;
this.showGuide8();
});
});
}
// 商店
private showGuide8() {
this.guide7.visible = false;
this.curGuide = this.guide8;
this.land2 && this.removeChild(this.land2);
this.showBg();
Tween.get(this.guide8)
.set({visible: true, alpha: 0})
.to({alpha: 1}, 350);
this.storeBtn.once(MouseEvent.CLICK, () => {
sendTbNet(TbNetName.guide, {
activityId: activityId,
index: 5
}, (success, res) => {
if (!success) return;
this.hideBg();
setTbData(TbNetName.gameInfo, res);
SceneCtrl.instance.change(GameScene);
});
});
}
private guide2Plant(e) {
sendTbNet(TbNetName.guide, {
activityId: activityId,
index: 2,
plantType: e.data
}, (success, res) => {
if (!success) {
return;
}
if (!res.data) {
showToast('请稍后再试');
}
for (let i = 0; i < res.data.plants.length; i++) {
if (res.data.plants[i].index == 2) {
this.land2.addPlant(res.data.plants[i]);
this.plantList.hidden();
this.land2.removeOption();
this.hideBg();
this.land2.removeEventListener(MouseEvent.CLICK, this.plantList.show, this.plantList);
setTimeout(() => {
this.showGuide3();
}, 2000)
break;
}
}
});
}
public initEvent() {
GDispatcher.addEventListener(G_EVENT.GUIDE2, this.showGuide2, this);
GDispatcher.addEventListener(G_EVENT.GUIDE2_PLANT, this.guide2Plant, this);
}
public removeEvent() {
GDispatcher.removeEventListener(G_EVENT.GUIDE2, this.showGuide2, this);
GDispatcher.removeEventListener(G_EVENT.GUIDE2_PLANT, this.guide2Plant, this);
}
public destroy() {
super.destroy();
}
}
src/parts/Game/Land.ts
View file @ 43775945
......@@ -126,7 +126,6 @@ export class Land extends Container {
* @param data
*/
public updatePlant(data) {
console.log(data);
this.plant.updatePlant(data);
this.waterRestCount = +data.waterRestCount;
......@@ -149,6 +148,8 @@ export class Land extends Container {
timestamp: +data.waterTime,
fullTime: +data.totalTime,
});
this.progressBar.show();
}
/**
......@@ -352,7 +353,7 @@ export class Land extends Container {
* 为自己添加一个Option
* @param {OPTION_TYPE} type Option的类型
*/
private addOption(type: OPTION_TYPE) {
public addOption(type: OPTION_TYPE) {
this.removeOption();
this.option = this.addChild(OptionPool.ins.takeOut(type));
if (type == OPTION_TYPE.WATER) {
......@@ -363,12 +364,14 @@ export class Land extends Container {
this.option.x = 160;
this.option.y = -50;
this.option.play();
return this.option;
}
/**
* 移除自己的当前Option
*/
private removeOption() {
public removeOption() {
if (this.option) {
this.option.removeAllEventListener();
this.removeChild(this.option);
......
src/parts/Game/PlantList.ts
View file @ 43775945
......@@ -13,10 +13,14 @@ import Ease = FYGE.Ease;
import GameLayer from "./GameLayer";
import MouseEvent = FYGE.MouseEvent;
import { Land } from "./Land";
import { activityId, sendTbNet, TbNetName } from "../../TaoBaoNet";
import { showToast } from "../../../module/ctrls";
import { GDispatcher } from "../../Main";
import { G_EVENT } from "../../const/GEVENT";
export default class PlantList extends Container {
private scrollList: ScrollList;
public scrollList: ScrollList;
// 对应哪个土地，即点击哪个土地来显示这个列表
private _bindId = -1;
......@@ -24,7 +28,7 @@ export default class PlantList extends Container {
return this._bindId;
}
constructor() {
constructor(isGuide = false) {
super();
// bg
......@@ -41,7 +45,10 @@ export default class PlantList extends Container {
this.scrollList = this.addChild(new ScrollList(ListPlant, 123, 160, 500, 160, false));
const data = [];
for (let k in s_PlantData) {
data.push(s_PlantData[k].key);
data.push({
key: s_PlantData[k].key,
isGuide: isGuide
});
}
this.scrollList.updateData(data);
this.scrollList.x = (this.width - 500) / 2;
......@@ -92,7 +99,7 @@ export default class PlantList extends Container {
*/
class ListPlant extends Container implements IScrollListItem {
id: number;
data: number;
data: any;
/**
* 数据更新
......@@ -101,8 +108,9 @@ class ListPlant extends Container implements IScrollListItem {
*/
public initData(id: number, data: any) {
if (!data || data == PLANT_TYPE.NONE) return;
this.key = data;
this.img.texture = RES.getRes(`种植框_${s_PlantData[data].name}.png`);
this.key = data.key;
this.data = data;
this.img.texture = RES.getRes(`种植框_${s_PlantData[data.key].name}.png`);
this.img.position.set((this.width - this.img.width) / 2 - 5, (this.height - this.img.height) / 2 + 20);
}
......@@ -168,12 +176,15 @@ class ListPlant extends Container implements IScrollListItem {
this.addEventListener(MouseEvent.MOUSE_OUT, up);
this.addEventListener(MouseEvent.CLICK, () => {
if(this.data.isGuide){
GDispatcher.dispatchEvent(G_EVENT.GUIDE2_PLANT, this.key);
return;
}
Land.activeLand.deactivate();
const bindId = GameLayer.ins.plantList.bindId;
/// TODO 请求种植接口
console.log(`点到了: ${this.key} ${s_PlantData[this.key].name}, 土地Id: ${bindId}`);
console.log('请求种植接口');
GameLayer.ins.addPlant(bindId, this.key);
......
src/parts/Game/ProgressBar.ts
View file @ 43775945
......@@ -119,7 +119,7 @@ export default class ProgressBar extends Container {
.set({alpha: 0, visible: true})
.to({alpha: 1}, 500, Ease.quadInOut);
tw.wait(3000)
tw.wait(5000)
.call(() => {
this.hidden();
});
......
src/parts/UI/UILayer.ts
View file @ 43775945
......@@ -27,6 +27,7 @@ export class UILayer extends Container {
private taskBtn: Sprite; // 任务按钮
private wareHouseBtn: Sprite; // 仓库按钮
private storeBtn: Sprite; // 商店按钮
private recordBtn: Sprite; // 商店按钮
constructor() {
super();
......@@ -43,13 +44,13 @@ export class UILayer extends Container {
}
public initEvents() {
[this.ruleBtn, this.taskBtn, this.wareHouseBtn, this.storeBtn].forEach((v) => {
[this.ruleBtn, this.taskBtn, this.wareHouseBtn, this.storeBtn, this.recordBtn].forEach((v) => {
v.addEventListener(MouseEvent.CLICK, this.touchBtn, this);
});
}
public removeEvents() {
[this.ruleBtn, this.taskBtn, this.wareHouseBtn, this.storeBtn].forEach((v) => {
[this.ruleBtn, this.taskBtn, this.wareHouseBtn, this.storeBtn, this.recordBtn].forEach((v) => {
v.removeEventListener(MouseEvent.CLICK, this.touchBtn, this);
});
}
......@@ -75,7 +76,9 @@ export class UILayer extends Container {
break;
case this.ruleBtn:
console.log('点击了规则');
// PanelCtrl.instance.show(RulePanel);
PanelCtrl.instance.show(RulePanel);
break;
case this.recordBtn:
PanelCtrl.instance.show(ExRecordPanel);
break;
}
......@@ -115,6 +118,10 @@ export class UILayer extends Container {
this.ruleBtn.position.set(622, 0);
this.ruleBtn.name = '规则';
this.recordBtn = topGroup.addChild(Tool.getSprite('btn_兑换记录.png'));
this.recordBtn.position.set(622, 130);
this.recordBtn.name = '兑换记录';
topGroup.y = getAdjustTopHeight(topGroup, 117 / 1624);
}
......
src/scenes/GameScene.ts
View file @ 43775945
......@@ -36,6 +36,7 @@ export class GameScene extends Scene {
this.uiLayer = this.addChild(new UILayer());
// 游戏层
GameLayer.kill();
this.gameLayer = this.addChild(GameLayer.ins);
......
src/scenes/GuideScene.ts 0 → 100644
View file @ 43775945
import { Scene } from "../../module/views/Scene";
import { Tool } from "../Tools";
import GameLayer from "../parts/Game/GameLayer";
import { UILayer } from "../parts/UI/UILayer";
import { Land } from "../parts/Game/Land";
import MouseEvent = FYGE.MouseEvent;
import { gameResource } from "../const/staticData";
import PanelCtrl from "../../module/ctrls/panelCtrl";
import GuidePanel from "../panels/GuidePanel";
import GuideLayer from "../parts/Game/GuideLayer";
import { getTbData, TbNetName } from "../TaoBaoNet";
export class GuideScene extends Scene {
get groupNames() {
return gameResource;
}
// 游戏层
private gameLayer: GameLayer; // 游戏层
// UI层
private uiLayer: UILayer;
// 引导层
private guideLayer: GuideLayer;
initUi() {
// 背景图
this.addChild(Tool.getSprite('game_bg.jpg'))
.addEventListener(MouseEvent.CLICK, () => {
console.log('点击了BG');
GameLayer.ins.plantList.hidden(); // 隐藏种植栏
Land.activeLand && Land.activeLand.deactivate();
});
// UI层
this.uiLayer = this.addChild(new UILayer());
// 游戏层
GameLayer.kill();
this.gameLayer = this.addChild(GameLayer.ins);
// 引导层
this.guideLayer = this.addChild(new GuideLayer());
}
public destroy() {
super.destroy();
}
start() {
super.start();
this.guideLayer.start();
const gameInfo: any = getTbData(TbNetName.gameInfo).data;
const guideStep = gameInfo.guideStep;
if (guideStep < 1) {
PanelCtrl.instance.show(GuidePanel);
}
}
initEvents() {
super.initEvents();
this.gameLayer.initEvent();
this.uiLayer.initEvents();
this.guideLayer.initEvent();
}
removeEvents() {
super.removeEvents();
this.gameLayer.removeEvent();
this.uiLayer.removeEvents();
this.guideLayer.removeEvent();
}
}
src/scenes/LoadingScene.ts
View file @ 43775945
import { Scene } from "../../module/views/Scene";
import { Tool } from "../Tools";
import { activityId, sellerId, sendTbNet, setActiveId, setTbData, TbNetName } from "../TaoBaoNet";
import { activityId, getTbData, sellerId, sendTbNet, setActiveId, setTbData, TbNetName } from "../TaoBaoNet";
import { getAdjustTopHeight } from "../const/myLab";
import SceneCtrl from "../../module/ctrls/sceneCtrl";
import { GameScene } from "./GameScene";
......@@ -8,13 +8,14 @@ import OptionPool from "../const/OptionPool";
import PlantEffectPool from "../const/PlantEffectPool";
import { RES } from "../../module/RES";
import { gameResource } from "../const/staticData";
import { checkShopFavoredStatus, getAuthUserInfo } from "../utils";
import Container = FYGE.Container;
import Sprite = FYGE.Sprite;
import Tween = FYGE.Tween;
import Ease = FYGE.Ease;
import Graphics = FYGE.Graphics;
import TextField = FYGE.TextField;
import { checkShopFavoredStatus, getAuthUserInfo } from "../utils";
import { GuideScene } from "./GuideScene";
export class LoadingScene extends Scene {
......@@ -135,7 +136,8 @@ export class LoadingScene extends Scene {
this.titleEffect().call(() => {
this.startLoading().call(() => {
SceneCtrl.instance.change(GameScene);
const gameInfo: any = getTbData(TbNetName.gameInfo);
SceneCtrl.instance.change(gameInfo.guideIsEnd ? GameScene : GuideScene);
});
});
}
......
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