Skip to content

B
babycare_xiaoxiao
Commit 8422ba1b authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

换了点皮,换了下接口

parent a995fc3a
Show whitespace changes
Inline Side-by-side
Showing with 116 additions and 286 deletions
.idea/workspace.xml
View file @ 8422ba1b
......@@ -2,128 +2,18 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="9cef0552-af3c-4a1c-be1f-dc41ebe5b6db" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/.idea/codeStyles/codeStyleConfig.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.completeTask.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.consumerTools.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.doJoin.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.drawLotteryPrize.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.gameOver.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.getActivityBaseInfoById.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.getMyPrizeList.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.getRemainTimes.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.getTaskList.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.getToolsInfo.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.receiveEnamePrize.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.receiveObjectPrize.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.receiveTaskRewards.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/aaaa.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" 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/babycare.completeTask.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/babycare.consumerTools.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/babycare.dojoin.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/babycare.exchange.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/babycare.gameOver.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/babycare.getActivityBaseInfoById.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/babycare.getGameInfo.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/babycare.getIndex.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/babycare.getPrizesByLevel.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/babycare.getTaskList.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/babycare.luckyDraw.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/babycare.queryCredits.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/babycare.receiveTaskRewards.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/bb.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/output.js" beforeDir="false" afterPath="$PROJECT_DIR$/output.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/BuyPowerPanel/增加体力背景.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/BuyPowerPanel/无字按钮底.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/CreditsOutPanel/积分不足背景.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/CreditsOutPanel/赚取积分.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/ExchangeSucPanel/兑换成功背景.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/ExchangeSucPanel/知道啦.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/FailedPanel/失败Bg.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/FailedPanel/失败Bg.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/FailedPanel/失败重新闯关.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/FailedPanel/失败重新闯关.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/FreePowerPanel/圆圈.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/FreePowerPanel/圆圈.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/FreePowerPanel/开心收下.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/FreePowerPanel/开心收下.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/NoPrizePanel/noPrizeBg.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/NoPrizePanel/知道了.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/NoStepPanel/步数耗尽Bg.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/NoStepPanel/步数耗尽Bg.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/NoStepPanel/步数耗尽复活.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/NoStepPanel/步数耗尽复活.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/NoStepPanel/步数耗尽结束按钮.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/NoStepPanel/步数耗尽结束按钮.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/RulePanel/活动规则背景.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/RulePanel/活动规则背景.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/StartPanel/开始闯关Bg.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/StartPanelPrize/关卡弹窗Bg.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/StartPanelPrize/关卡弹窗Bg.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/SuccessPanel/闯关成功.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/SuccessPanel/闯关成功.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/SuccessPanel/闯关成功Bg.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/SuccessPanel/闯关成功Bg.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/SuccessPanel/闯关成功不满星按钮.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/SuccessPanel/闯关成功不满星按钮.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/TaskPanel/任务背景.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/TaskPanel/任务背景.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/ToolsOutPanel/道具不足背景.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/UseToolPanel/使用道具背景.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/UseToolPanel/使用道具背景.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/common/ele5.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/ele5.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/common/ele7.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/ele7.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/common/ele9.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/ele9.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/common/stepBtn.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/stepBtn.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/common/关闭按钮.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/关闭按钮.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/common/再想想.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/再想想.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/common/开始闯关要能量.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/开始闯关要能量.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/common/确定.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/确定.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/common/继续闯关大.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/继续闯关大.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/common/继续闯关小.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/继续闯关小.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/bubleEle0.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/bubleEle0.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/bubleEle1.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/bubleEle1.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/bubleEle2.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/bubleEle2.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/bubleEle3.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/bubleEle3.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/bubleEle4.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/bubleEle4.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/hairballDisBg.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/hairballDisBg.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/hairballPiece1.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/hairballPiece1.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/hairballPiece2.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/hairballPiece2.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/hairballPiece3.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/hairballPiece3.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/hairballPiece4.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/hairballPiece4.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/hairballPiece5.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/hairballPiece5.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/hairballPiece6.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/hairballPiece6.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/hairballPiece7.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/hairballPiece7.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/hairballPiece8.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/hairballPiece8.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/ice2.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/ice2.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/ice3.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/ice3.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/ice4.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/ice4.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/ice6.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/ice6.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/lockVine.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/lockVine.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/magicLion.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/magicLion.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/rock2.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/rock2.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/rock3.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/rock3.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/rock4.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/rock4.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/rock5.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/rock5.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/rock6.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/rock6.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.getActivityBaseInfoById.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.getActivityBaseInfoById.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/PrizePanel/prizePanel.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/PrizePanel/prizePanelBtn.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/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/SkinJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/SkinJson.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/Tools.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/Tools.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/BuyPowerPanel.ts" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/CreditsOutPanel.ts" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/ExchangeSucPanel.ts" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/FailedPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/FailedPanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/NoEnergyPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/NoEnergyPanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/NoPrizePanel.ts" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/NoStepPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/NoStepPanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/PrizePanel.ts" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/RulePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/RulePanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/StartPanel.ts" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/StartPanelPrize.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/StartPanelPrize.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/SuccessNoPrizePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/SuccessNoPrizePanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/SuccessPrizePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/SuccessPrizePanel.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/panels/ToolsOutPanel.ts" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/WxPrizePanel.ts" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/LoadingScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/LoadingScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/LotteryScene.ts" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/PlayScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/PlayScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/CheckBtn.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/CheckBtn.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapTop.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapTop.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapUI.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapUI.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/something/enum/PropType.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/enum/PropType.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/something/periodAni/MagicLionBgAni.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/periodAni/MagicLionBgAni.ts" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -218,9 +108,9 @@
</configuration>
<recent_temporary>
<list>
<item itemvalue="npm.flushRes" />
<item itemvalue="npm.dev" />
<item itemvalue="JavaScript Debug.aaaa.html" />
<item itemvalue="npm.flushRes" />
</list>
</recent_temporary>
</component>
......@@ -266,7 +156,7 @@
<workItem from="1596505747021" duration="2300000" />
<workItem from="1596609620649" duration="537000" />
<workItem from="1600912046696" duration="16271000" />
<workItem from="1600998191749" duration="17952000" />
<workItem from="1600998191749" duration="22282000" />
</task>
<task id="LOCAL-00001" summary="111">
<created>1594122339119</created>
......@@ -597,7 +487,14 @@
<option name="project" value="LOCAL" />
<updated>1600860459931</updated>
</task>
<option name="localTasksCounter" value="48" />
<task id="LOCAL-00048" summary="换了点皮,换了下接口">
<created>1601022208894</created>
<option name="number" value="00048" />
<option name="presentableId" value="LOCAL-00048" />
<option name="project" value="LOCAL" />
<updated>1601022208894</updated>
</task>
<option name="localTasksCounter" value="49" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -623,7 +520,8 @@
<MESSAGE value="120未中奖不弹弹窗" />
<MESSAGE value="toast" />
<MESSAGE value="换了点皮" />
<option name="LAST_COMMIT_MESSAGE" value="换了点皮" />
<MESSAGE value="换了点皮,换了下接口" />
<option name="LAST_COMMIT_MESSAGE" value="换了点皮,换了下接口" />
</component>
<component name="WindowStateProjectService">
<state x="440" y="273" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1595229546530">
......@@ -638,49 +536,49 @@
<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="557" y="183" width="884" height="891" key="CommitChangelistDialog2" timestamp="1600860459735">
<state x="557" y="183" width="884" height="891" key="CommitChangelistDialog2" timestamp="1601022207836">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="557" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1600860459735" />
<state x="557" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1601022207836" />
<state x="558" y="183" width="884" height="891" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1595584297912" />
<state x="131" y="123" width="730" height="977" key="DiffContextDialog" timestamp="1596165868169">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="131" y="123" width="730" height="977" key="DiffContextDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1596165868169" />
<state width="877" height="321" key="GridCell.Tab.0.bottom" timestamp="1601020736126">
<state width="877" height="321" key="GridCell.Tab.0.bottom" timestamp="1601025812217">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="869" height="321" key="GridCell.Tab.0.bottom/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1600867804217" />
<state width="885" height="321" key="GridCell.Tab.0.bottom/30.23.1410.877@30.23.1410.877" timestamp="1600962876448" />
<state width="888" height="321" key="GridCell.Tab.0.bottom/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" />
<state width="877" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1601020736126" />
<state width="877" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1601025812217" />
<state width="1041" height="321" key="GridCell.Tab.0.bottom/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" />
<state width="1041" height="321" key="GridCell.Tab.0.bottom/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918465" />
<state width="877" height="321" key="GridCell.Tab.0.center" timestamp="1601020736125">
<state width="877" height="321" key="GridCell.Tab.0.center" timestamp="1601025812216">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="869" height="321" key="GridCell.Tab.0.center/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1600867804216" />
<state width="885" height="321" key="GridCell.Tab.0.center/30.23.1410.877@30.23.1410.877" timestamp="1600962876447" />
<state width="888" height="321" key="GridCell.Tab.0.center/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" />
<state width="877" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1601020736125" />
<state width="877" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1601025812216" />
<state width="1041" height="321" key="GridCell.Tab.0.center/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" />
<state width="1041" height="321" key="GridCell.Tab.0.center/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918464" />
<state width="877" height="321" key="GridCell.Tab.0.left" timestamp="1601020736124">
<state width="877" height="321" key="GridCell.Tab.0.left" timestamp="1601025812216">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="869" height="321" key="GridCell.Tab.0.left/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1600867804216" />
<state width="885" height="321" key="GridCell.Tab.0.left/30.23.1410.877@30.23.1410.877" timestamp="1600962876447" />
<state width="888" height="321" key="GridCell.Tab.0.left/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" />
<state width="877" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1601020736124" />
<state width="877" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1601025812216" />
<state width="1041" height="321" key="GridCell.Tab.0.left/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577197" />
<state width="1041" height="321" key="GridCell.Tab.0.left/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918463" />
<state width="877" height="321" key="GridCell.Tab.0.right" timestamp="1601020736126">
<state width="877" height="321" key="GridCell.Tab.0.right" timestamp="1601025812217">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="869" height="321" key="GridCell.Tab.0.right/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1600867804217" />
<state width="885" height="321" key="GridCell.Tab.0.right/30.23.1410.877@30.23.1410.877" timestamp="1600962876447" />
<state width="888" height="321" key="GridCell.Tab.0.right/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" />
<state width="877" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1601020736126" />
<state width="877" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1601025812217" />
<state width="1041" height="321" key="GridCell.Tab.0.right/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" />
<state width="1041" height="321" key="GridCell.Tab.0.right/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918465" />
<state x="82" y="353" key="IDE.errors.dialog" timestamp="1594777965326">
......@@ -697,10 +595,10 @@
</state>
<state x="289" y="314" key="SettingsEditor/30.23.1890.1177@30.23.1890.1177" timestamp="1596079390860" />
<state x="300" y="248" key="SettingsEditor/31.23.1889.1177@31.23.1889.1177" timestamp="1594798992724" />
<state x="91" y="351" key="Vcs.Push.Dialog.v2" timestamp="1600860461022">
<state x="91" y="351" key="Vcs.Push.Dialog.v2" timestamp="1601022211484">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1600860461022" />
<state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1601022211484" />
<state x="92" y="351" key="Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177" timestamp="1595584299423" />
<state x="87" y="216" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1594705166397">
<screen x="31" y="23" width="1889" height="1177" />
......@@ -729,11 +627,11 @@
</state>
<state x="156" y="286" key="run.anything.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1596432664001" />
<state x="157" y="286" key="run.anything.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595475548860" />
<state x="639" y="288" width="671" height="676" key="search.everywhere.popup" timestamp="1601021586072">
<state x="639" y="288" width="671" height="676" key="search.everywhere.popup" timestamp="1601023938655">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="484" y="220" width="670" height="504" key="search.everywhere.popup/30.23.1410.877@30.23.1410.877" timestamp="1600829323295" />
<state x="639" y="288" width="671" height="676" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1601021586072" />
<state x="639" y="288" width="671" height="676" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1601023938655" />
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595584259535" />
</component>
</project>
\ No newline at end of file
mock/miniTb/popmartXXL2c.getActivityBaseInfoById.json
View file @ 8422ba1b
......@@ -5,7 +5,7 @@
"data": {
"rule": "测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试",
"currentLevel": 120,
"power": 100,
"power": 0,
"tools": {
"steps": 100,
"booms": 100,
......
resource/res.json
View file @ 8422ba1b
{
"groups": [
{
"keys": "增加体力背景.png,无字按钮底.png",
"name": "BuyPowerPanel"
},
{
"keys": "积分不足背景.png,赚取积分.png",
"name": "CreditsOutPanel"
},
{
"keys": "兑换成功背景.png,知道啦.png",
"name": "ExchangeSucPanel"
},
{
"keys": "失败Bg.png,失败重新闯关.png",
"name": "FailedPanel"
......@@ -28,42 +16,26 @@
"keys": "体力不足Bg.png,体力不足按钮.png",
"name": "NoEnergyPanel"
},
{
"keys": "noPrizeBg.png,知道了.png",
"name": "NoPrizePanel"
},
{
"keys": "步数耗尽Bg.png,步数耗尽复活.png,步数耗尽结束按钮.png",
"name": "NoStepPanel"
},
{
"keys": "prizePanel.png,prizePanelBtn.png",
"name": "PrizePanel"
},
{
"keys": "活动规则背景.png",
"name": "RulePanel"
},
{
"keys": "开始闯关Bg.png",
"name": "StartPanel"
},
{
"keys": "关卡弹窗Bg.png",
"name": "StartPanelPrize"
},
{
"keys": "star_dis.png,star_en.png,去抽奖.png,圆角矩形 648.png,开奖按钮120.png,道具圆圈.png,闯关成功.png,闯关成功Bg.png,闯关成功不满星按钮.png",
"keys": "star_dis.png,star_en.png,去抽奖.png,圆角矩形 648.png,开奖按钮120.png,查看奖品.png,继续闯关红.png,道具圆圈.png,闯关成功.png,闯关成功Bg.png,闯关成功不满星按钮.png",
"name": "SuccessPanel"
},
{
"keys": "任务背景.png,去完成.png,去完成灰.png,待领取.png",
"name": "TaskPanel"
},
{
"keys": "道具不足背景.png",
"name": "ToolsOutPanel"
},
{
"keys": "使用道具背景.png",
"name": "UseToolPanel"
......
src/ResJson.ts
View file @ 8422ba1b
export const ResJson = {
"groups": [
{
"keys": "增加体力背景.png,无字按钮底.png",
"name": "BuyPowerPanel"
},
{
"keys": "积分不足背景.png,赚取积分.png",
"name": "CreditsOutPanel"
},
{
"keys": "兑换成功背景.png,知道啦.png",
"name": "ExchangeSucPanel"
},
{
"keys": "失败Bg.png,失败重新闯关.png",
"name": "FailedPanel"
......@@ -28,42 +16,26 @@ export const ResJson = {
"keys": "体力不足Bg.png,体力不足按钮.png",
"name": "NoEnergyPanel"
},
{
"keys": "noPrizeBg.png,知道了.png",
"name": "NoPrizePanel"
},
{
"keys": "步数耗尽Bg.png,步数耗尽复活.png,步数耗尽结束按钮.png",
"name": "NoStepPanel"
},
{
"keys": "prizePanel.png,prizePanelBtn.png",
"name": "PrizePanel"
},
{
"keys": "活动规则背景.png",
"name": "RulePanel"
},
{
"keys": "开始闯关Bg.png",
"name": "StartPanel"
},
{
"keys": "关卡弹窗Bg.png",
"name": "StartPanelPrize"
},
{
"keys": "star_dis.png,star_en.png,去抽奖.png,圆角矩形 648.png,开奖按钮120.png,道具圆圈.png,闯关成功.png,闯关成功Bg.png,闯关成功不满星按钮.png",
"keys": "star_dis.png,star_en.png,去抽奖.png,圆角矩形 648.png,开奖按钮120.png,查看奖品.png,继续闯关红.png,道具圆圈.png,闯关成功.png,闯关成功Bg.png,闯关成功不满星按钮.png",
"name": "SuccessPanel"
},
{
"keys": "任务背景.png,去完成.png,去完成灰.png,待领取.png",
"name": "TaskPanel"
},
{
"keys": "道具不足背景.png",
"name": "ToolsOutPanel"
},
{
"keys": "使用道具背景.png",
"name": "UseToolPanel"
......
src/SkinJson.ts
View file @ 8422ba1b
......@@ -87,46 +87,13 @@ export const SkinJson = {
{
"name": "闯关成功",
"x": 53,
"y": 190,
"y": 209,
"alpha": 1,
"type": "sprite",
"props": {
"source": "闯关成功.png"
}
},
{
"name": "继续闯关大",
"x": 163,
"y": 1109,
"alpha": 1,
"type": "button",
"props": {
"tUp": "继续闯关大.png"
},
"id": "noPrizeAgainBtn"
},
{
"name": "继续闯关小",
"x": 93,
"y": 1109,
"alpha": 1,
"type": "button",
"props": {
"tUp": "继续闯关小.png"
},
"id": "againBtn"
},
{
"name": "去抽奖",
"x": 383,
"y": 1109,
"alpha": 1,
"type": "button",
"props": {
"tUp": "去抽奖.png"
},
"id": "goPrizeBtn"
},
{
"name": "提示文案",
"x": 182,
......@@ -137,7 +104,6 @@ export const SkinJson = {
"text": "太厉害了！获得抽奖资格！",
"size": 34,
"fillColor": "#df5942",
"textAlpha": 1,
"bold": true
},
"id": "tipsTex"
......@@ -145,7 +111,7 @@ export const SkinJson = {
{
"name": "红包奖励",
"x": 130,
"y": 850,
"y": 862,
"alpha": 1,
"type": "sprite",
"props": {
......@@ -153,10 +119,24 @@ export const SkinJson = {
},
"id": "prizeImg"
},
{
"name": "提示文案",
"x": 182,
"y": 1095,
"alpha": 1,
"type": "text",
"props": {
"text": "奖品可以在“我的奖品”页面查看",
"size": 24,
"fillColor": "#df5942",
"bold": true
},
"id": "tipsTex2"
},
{
"name": "关闭按钮",
"x": 631,
"y": 421,
"x": 625,
"y": 431,
"alpha": 1,
"type": "button",
"props": {
......
src/Tools.ts
View file @ 8422ba1b
......@@ -2,14 +2,12 @@ import { RES } from "../module/RES";
import { layers } from "../module/views/layers";
import Tween = FYGE.Tween;
import Ease = FYGE.Ease;
import { sendTbNet, TbNetName, getTbData } from "./TaoBaoNet";
import { sendTbNet, TbNetName } from "./TaoBaoNet";
import { PropType } from "./something/enum/PropType";
import { showToast } from "../module/ctrls";
import { showPanel } from "../module/ctrls";
import { FailedPanel } from "./panels/FailedPanel";
import { SuccessPrizePanel } from "./panels/SuccessPrizePanel";
import { SuccessNoPrizePanel } from "./panels/SuccessNoPrizePanel";
import { CreditsOutPanel } from "./panels/CreditsOutPanel";
/**
* 定制，记录一些全局量和方法
......@@ -117,12 +115,10 @@ export class Tools {
public static gameOver(data) {
if (!data.isVisitSuccess) { // 闯关失败
showPanel(FailedPanel, data);
} else if ((data.prize && data.prize.image) || (data.tool && data.tool.type) || data.level == 120) { // 闯关成功，奖励关卡
//120关，如果没有奖品图片，伪造一个
if (data.level == 120 && (!data.prize || !data.prize.image)) {
data.prize = data.prize || {};
data.prize.image = Tools.baseInfo.levelPrize['level_120'];
}
} else if (
(data.prize && data.prize.image)
|| (data.tool && data.tool.type)
) { // 闯关成功，奖励关卡
showPanel(SuccessPrizePanel, data);
} else { // 闯关成功，不是奖励关卡
showPanel(SuccessNoPrizePanel, data);
......
src/panels/NoEnergyPanel.ts
View file @ 8422ba1b
import { Panel } from "../../module/views/Panel";
import MouseEvent = FYGE.MouseEvent;
import { showPanel } from "../../module/ctrls";
import { TaskPanel } from "./TaskPanel";
export class NoEnergyPanel extends Panel {
get groupNames() {
......@@ -25,6 +26,7 @@ export class NoEnergyPanel extends Panel {
initEvents() {
super.initEvents();
this.okBtn.addEventListener(MouseEvent.CLICK, () => {
showPanel(TaskPanel);
this.hidePanel();
}, this);
}
......
src/panels/StartPanelPrize.ts
View file @ 8422ba1b
......@@ -78,8 +78,9 @@ export class StartPanelPrize extends Panel {
const {level, isPlayed} = this.data;
this.enableMouseEvt(false);
if (!isPlayed && Tools.propInfo.power <= 0) {// 体力不足
showPanel(NoEnergyPanel);
this.enableMouseEvt(true);
showPanel(NoEnergyPanel);
this.hidePanel();
return;
}
sendTbNet(TbNetName.dojoin, {level: level},
......@@ -87,9 +88,6 @@ export class StartPanelPrize extends Panel {
this.enableMouseEvt(true);
if (!success) return;
// 访问页面埋点
sendTbNet(TbNetName.reportAnalytics, {logkey: 'join'});
Tools.propInfo.power = res.data.power;
changeScene(PlayScene, {chapter: level});
this.hidePanel();
......
src/panels/SuccessPrizePanel.ts
View file @ 8422ba1b
......@@ -4,12 +4,19 @@ import { SuccessStarGroup } from "./SuccessNoPrizePanel";
import Tween = FYGE.Tween;
import Ease = FYGE.Ease;
import Sprite = FYGE.Sprite;
import Texture = FYGE.Texture;
import { PropType } from "../something/enum/PropType";
import { RES } from "../../module/RES";
import { changeScene } from "../../module/ctrls";
import { MapScene } from "../scene/map/MapScene";
import MouseEvent = FYGE.MouseEvent;
import Button = FYGE.Button;
import Texture = FYGE.Texture;
const propImg = {
[PropType.BOOMS]: 'boomBtn.png',
[PropType.HAMMERS]: 'hammerBtn.png',
[PropType.STEPS]: 'stepBtn.png'
}
export class SuccessPrizePanel extends Panel {
get groupNames() {
......@@ -34,57 +41,62 @@ export class SuccessPrizePanel extends Panel {
closeBtn: FYGE.Button;
tipsTex: FYGE.TextField;
againBtn: FYGE.Button;
noPrizeAgainBtn: FYGE.Button;
goPrizeBtn: FYGE.Button;
tipsTex2: FYGE.TextField;
prizeImg: Sprite;
private starGroup: SuccessStarGroup = null;
initUi() {
const {level, stars, tool, prize} = this.data;
this.tipsTex.textWidth = 750;
this.tipsTex.x = 0;
this.tipsTex.textAlign = TEXT_ALIGN.CENTER;
this.tipsTex2.textWidth = 750;
this.tipsTex2.x = 0;
this.tipsTex2.textAlign = TEXT_ALIGN.CENTER;
this.starGroup = this.addChild(new SuccessStarGroup());
this.starGroup.position.set(375, 648);
this.starGroup.position.set(375, 663);
this.prizeImg.anchorTexture.x = 0.5;
this.prizeImg.x = 375;
this.starGroup.play(this.data.stars);
if (this.data.tool && this.data.tool.type) {
this.againBtn.visible = false;
this.goPrizeBtn.visible = false;
this.tipsTex.text = '闯关成功！获得奖励：';
this.prizeImg.scale.set(1.4, 1.4);
switch (this.data.tool.type) {
case PropType.BOOMS:
this.prizeImg.texture = RES.getRes('boomBtn.png');
break;
case PropType.HAMMERS:
this.prizeImg.texture = RES.getRes('hammerBtn.png');
break;
case PropType.STEPS:
this.prizeImg.texture = RES.getRes('stepBtn.png');
break;
}
} else if (this.data.prize && this.data.prize.image) {
if (this.data.level == 120) {//120关不显示闯关按钮，换图
this.againBtn.visible = false;
this.goPrizeBtn.visible = false;
this.noPrizeAgainBtn.changeTexture(RES.getRes("开奖按钮120.png"))
this.starGroup.play(stars);
if (tool && tool.type) {
this.tipsTex.text = '\t闯关成功！获得奖励：';
this.prizeImg.scale.set(1.8, 1.8);
this.prizeImg.texture = RES.getRes(propImg[tool.type]);
if (stars == 3) {
this.tipsTex2.visible = false;
this.prizeImg.y = 879;
this.addChild(new Button(RES.getRes('继续闯关大.png')))
.addEventListener(MouseEvent.CLICK, this.continue, this)
.position.set(163, 1109);
} else {
this.noPrizeAgainBtn.visible = false;
this.tipsTex2.text = '满星通关可抽取更大奖励哦';
this.addChild(new Button(RES.getRes('继续闯关小.png')))
.addEventListener(MouseEvent.CLICK, this.continue, this)
.position.set(388, 1145);
this.addChild(new Button(RES.getRes('闯关成功不满星按钮.png')))
.addEventListener(MouseEvent.CLICK, this.again, this)
.position.set(100, 1145);
}
} else if (prize && prize.image) {
this.prizeImg.texture = Texture.fromUrl(prize.image);
this.tipsTex2.text = '奖品可以在“我的奖品”页面查看';
this.addChild(new Button(RES.getRes('继续闯关红.png')))
.addEventListener(MouseEvent.CLICK, this.continue, this)
.position.set(388, 1145);
this.prizeImg.texture = Texture.fromUrl(this.data.prize.image);
// this.tipsTex.text = '\t\t闯关成功！获得抽大奖机会！';
this.tipsTex.text = '\t闯关成功！有机会抽取如下奖品';
this.addChild(new Button(RES.getRes('查看奖品.png')))
.addEventListener(MouseEvent.CLICK, this.lookPrize, this)
.position.set(100, 1145);
}
}
......@@ -92,6 +104,16 @@ export class SuccessPrizePanel extends Panel {
super.start();
}
/**
* 查看奖品
*/
private lookPrize() {
/// TODO 查看奖品
console.log('查看奖品');
changeScene(MapScene);
super.hidePanel();
}
/**
* 挑战满星
*/
......@@ -112,13 +134,6 @@ export class SuccessPrizePanel extends Panel {
super.hidePanel();
}
public goPrize() {
// 去抽奖
super.hidePanel();
}
public hidePanel() {
changeScene(MapScene);
super.hidePanel();
......@@ -126,9 +141,6 @@ export class SuccessPrizePanel extends Panel {
initEvents() {
super.initEvents();
this.againBtn.addEventListener(MouseEvent.CLICK, this.continue, this);
this.noPrizeAgainBtn.addEventListener(MouseEvent.CLICK, this.continue, this);
this.goPrizeBtn.addEventListener(MouseEvent.CLICK, this.goPrize, this);
}
removeEvents() {
......
src/scene/map/MapScene.ts
View file @ 8422ba1b
......@@ -223,7 +223,7 @@ export class MapScene extends Scene {
// Tools.gameOver({
// level: 1,
// score: 666,
// stars: 3,
// stars: 2,
// isVisitSuccess: true,
// isPrizeLevel: false,
// // tool: {
......
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