Skip to content

B
babycare_xiaoxiao
Commit 60b59494 authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

Success Panel Effect!

parent 3a9c0c89
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 36 deletions
.idea/workspace.xml
View file @ 60b59494
......@@ -3,9 +3,14 @@
<component name="ChangeListManager">
<list default="true" id="9cef0552-af3c-4a1c-be1f-dc41ebe5b6db" 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/babycare.getTaskList.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/babycare.getTaskList.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/common/G_EVENT.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/common/G_EVENT.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$/mock/miniTb/babycare.gameOver.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/babycare.gameOver.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/babycare.getIndex.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/babycare.getIndex.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/StartPanelPrize/prize.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/SuccessPanel/道具.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/res.json" beforeDir="false" afterPath="$PROJECT_DIR$/resource/res.json" 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/scene/map/MapScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapScene.ts" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -111,7 +116,7 @@
<workItem from="1594777357248" duration="24313000" />
<workItem from="1594864188027" duration="20343000" />
<workItem from="1594950738970" duration="22032000" />
<workItem from="1595209499266" duration="7026000" />
<workItem from="1595209499266" duration="18405000" />
</task>
<task id="LOCAL-00001" summary="111">
<created>1594122339119</created>
......@@ -274,7 +279,14 @@
<option name="project" value="LOCAL" />
<updated>1595215296744</updated>
</task>
<option name="localTasksCounter" value="24" />
<task id="LOCAL-00024" summary="Success Panel Effect!">
<created>1595216703734</created>
<option name="number" value="00024" />
<option name="presentableId" value="LOCAL-00024" />
<option name="project" value="LOCAL" />
<updated>1595216703734</updated>
</task>
<option name="localTasksCounter" value="25" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -288,10 +300,10 @@
<option name="LAST_COMMIT_MESSAGE" value="Success Panel Effect!" />
</component>
<component name="WindowStateProjectService">
<state x="440" y="273" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1594106579644">
<state x="440" y="273" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1595229546530">
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="440" y="273" key="#com.intellij.execution.impl.EditConfigurationsDialog/31.23.1889.1177@31.23.1889.1177" timestamp="1594106579644" />
<state x="440" y="273" key="#com.intellij.execution.impl.EditConfigurationsDialog/31.23.1889.1177@31.23.1889.1177" timestamp="1595229546530" />
<state x="188" y="314" key="#dev" timestamp="1594691316512">
<screen x="31" y="23" width="1889" height="1177" />
</state>
......@@ -300,30 +312,30 @@
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="251" y="471" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/31.23.1889.1177@31.23.1889.1177" timestamp="1594113080922" />
<state x="754" y="183" key="CommitChangelistDialog2" timestamp="1595215296546">
<state x="754" y="183" key="CommitChangelistDialog2" timestamp="1595216703539">
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="754" y="183" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1595215296546" />
<state width="871" height="321" key="GridCell.Tab.0.bottom" timestamp="1595215073648">
<state x="754" y="183" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1595216703539" />
<state width="874" height="321" key="GridCell.Tab.0.bottom" timestamp="1595229554319">
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state width="882" height="321" key="GridCell.Tab.0.bottom/31.23.1649.1027@31.23.1649.1027" timestamp="1594827479519" />
<state width="871" height="321" key="GridCell.Tab.0.bottom/31.23.1889.1177@31.23.1889.1177" timestamp="1595215073648" />
<state width="871" height="321" key="GridCell.Tab.0.center" timestamp="1595215073646">
<state width="874" height="321" key="GridCell.Tab.0.bottom/31.23.1889.1177@31.23.1889.1177" timestamp="1595229554319" />
<state width="874" height="321" key="GridCell.Tab.0.center" timestamp="1595229554318">
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state width="882" height="321" key="GridCell.Tab.0.center/31.23.1649.1027@31.23.1649.1027" timestamp="1594827479518" />
<state width="871" height="321" key="GridCell.Tab.0.center/31.23.1889.1177@31.23.1889.1177" timestamp="1595215073646" />
<state width="871" height="321" key="GridCell.Tab.0.left" timestamp="1595215073646">
<state width="874" height="321" key="GridCell.Tab.0.center/31.23.1889.1177@31.23.1889.1177" timestamp="1595229554318" />
<state width="874" height="321" key="GridCell.Tab.0.left" timestamp="1595229554316">
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state width="882" height="321" key="GridCell.Tab.0.left/31.23.1649.1027@31.23.1649.1027" timestamp="1594827479517" />
<state width="871" height="321" key="GridCell.Tab.0.left/31.23.1889.1177@31.23.1889.1177" timestamp="1595215073646" />
<state width="871" height="321" key="GridCell.Tab.0.right" timestamp="1595215073647">
<state width="874" height="321" key="GridCell.Tab.0.left/31.23.1889.1177@31.23.1889.1177" timestamp="1595229554316" />
<state width="874" height="321" key="GridCell.Tab.0.right" timestamp="1595229554318">
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state width="882" height="321" key="GridCell.Tab.0.right/31.23.1649.1027@31.23.1649.1027" timestamp="1594827479518" />
<state width="871" height="321" key="GridCell.Tab.0.right/31.23.1889.1177@31.23.1889.1177" timestamp="1595215073647" />
<state width="874" height="321" key="GridCell.Tab.0.right/31.23.1889.1177@31.23.1889.1177" timestamp="1595229554318" />
<state x="82" y="353" key="IDE.errors.dialog" timestamp="1594777965326">
<screen x="31" y="23" width="1889" height="1177" />
</state>
......@@ -336,22 +348,22 @@
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="300" y="248" key="SettingsEditor/31.23.1889.1177@31.23.1889.1177" timestamp="1594798992724" />
<state x="92" y="351" key="Vcs.Push.Dialog.v2" timestamp="1595215298063">
<state x="92" y="351" key="Vcs.Push.Dialog.v2" timestamp="1595216704830">
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="92" y="351" key="Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177" timestamp="1595215298063" />
<state x="92" y="351" key="Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177" timestamp="1595216704830" />
<state x="87" y="216" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1594705166397">
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="87" y="216" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/31.23.1889.1177@31.23.1889.1177" timestamp="1594705166397" />
<state x="280" y="23" width="879" height="1158" key="dock-window-1" timestamp="1594969442619">
<state x="280" y="23" width="879" height="1158" key="dock-window-1" timestamp="1595227066273">
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="280" y="23" width="879" height="1158" key="dock-window-1/31.23.1889.1177@31.23.1889.1177" timestamp="1594969442619" />
<state x="907" y="23" width="879" height="1158" key="dock-window-2" timestamp="1594285002126">
<state x="280" y="23" width="879" height="1158" key="dock-window-1/31.23.1889.1177@31.23.1889.1177" timestamp="1595227066273" />
<state x="907" y="23" width="879" height="1158" key="dock-window-2" timestamp="1595227066273">
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="907" y="23" width="879" height="1158" key="dock-window-2/31.23.1889.1177@31.23.1889.1177" timestamp="1594285002126" />
<state x="907" y="23" width="879" height="1158" key="dock-window-2/31.23.1889.1177@31.23.1889.1177" timestamp="1595227066273" />
<state x="805" y="23" width="879" height="1158" key="dock-window-3" timestamp="1594604843980">
<screen x="31" y="23" width="1889" height="1177" />
</state>
......@@ -364,9 +376,9 @@
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="157" y="286" key="run.anything.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1594712635697" />
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup" timestamp="1595215066572">
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup" timestamp="1595231652652">
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595215066572" />
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595231652652" />
</component>
</project>
\ No newline at end of file
mock/miniTb/babycare.gameOver.json
View file @ 60b59494
......@@ -2,10 +2,14 @@
"code": "000000",
"data": {
"currentLevel": 11,
"prize": {},
"isPrizeLevel": false,
"tool": {}
"tool": {
"type": "HAMMERS"
},
"prize": {
"image": "https://img.alicdn.com/imgextra/i1/2275046294/O1CN01xTeKMI1wMhRux48Y6_!!2275046294-2-miniprogram.png"
}
},
"success": true,
"message": "成功"
}
\ No newline at end of file
}
mock/miniTb/babycare.getIndex.json
View file @ 60b59494
......@@ -4,7 +4,7 @@
"message": "OK",
"data": {
"power": 0,
"currentLevel": 1,
"currentLevel": 120,
"tools": {
"STEPS": 1,
"BOOMS": 2,
......
resource/res.json
View file @ 60b59494
......@@ -41,11 +41,11 @@
"name": "StartPanel"
},
{
"keys": "prize.png,关卡弹窗Bg.png",
"keys": "关卡弹窗Bg.png",
"name": "StartPanelPrize"
},
{
"keys": "star_dis.png,star_en.png,去抽奖.png,圆角矩形 648.png,道具.png,道具圆圈.png,闯关成功.png,闯关成功Bg.png,闯关成功不满星按钮.png",
"keys": "star_dis.png,star_en.png,去抽奖.png,圆角矩形 648.png,道具圆圈.png,闯关成功.png,闯关成功Bg.png,闯关成功不满星按钮.png",
"name": "SuccessPanel"
},
{
......
src/ResJson.ts
View file @ 60b59494
......@@ -41,11 +41,11 @@ export const ResJson = {
"name": "StartPanel"
},
{
"keys": "prize.png,关卡弹窗Bg.png",
"keys": "关卡弹窗Bg.png",
"name": "StartPanelPrize"
},
{
"keys": "star_dis.png,star_en.png,去抽奖.png,圆角矩形 648.png,道具.png,道具圆圈.png,闯关成功.png,闯关成功Bg.png,闯关成功不满星按钮.png",
"keys": "star_dis.png,star_en.png,去抽奖.png,圆角矩形 648.png,道具圆圈.png,闯关成功.png,闯关成功Bg.png,闯关成功不满星按钮.png",
"name": "SuccessPanel"
},
{
......
src/TaoBaoNet.ts
View file @ 60b59494
......@@ -160,6 +160,7 @@ let fc;
* @param netName
* @param parameter
* @param callback
* @param hideMsg
*/
export function sendTbNet(
netName: TbNetName,
......
src/scene/map/MapScene.ts
View file @ 60b59494
......@@ -13,8 +13,6 @@ import Sprite = FYGE.Sprite;
import Texture = FYGE.Texture;
import Tween = FYGE.Tween;
import Ease = FYGE.Ease;
import { sendTbNet, TbNetName } from "../../TaoBaoNet";
import { showToast } from "../../../module/ctrls";
export class MapScene extends Scene {
private mapContainer: Container = null;
......@@ -228,7 +226,7 @@ export class MapScene extends Scene {
// // },
// prize: {
// image: 'https://img.alicdn.com/imgextra/i1/2275046294/O1CN01xTeKMI1wMhRux48Y6_!!2275046294-2-miniprogram.png',
// }
// }]
// });
}
......
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