Skip to content

B
babycare_xiaoxiao
Commit 71900eb4 authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

礼盒loading引导

parent 3b0dd171
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 35 deletions
.idea/workspace.xml
View file @ 71900eb4
......@@ -5,7 +5,8 @@
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/output.js" beforeDir="false" afterPath="$PROJECT_DIR$/output.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/output.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/output.js.map" 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/PlayScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/PlayScene.ts" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -73,7 +74,7 @@
<recent name="$PROJECT_DIR$/resource/SuccessPanel" />
</key>
</component>
<component name="RunManager" selected="npm.build">
<component name="RunManager" selected="npm.buildTS">
<configuration name="aaa.html" type="JavascriptDebugType" temporary="true" nameIsGenerated="true" uri="http://localhost:63342/ppmt_xxl/aaa.html" useBuiltInWebServerPort="true">
<method v="2" />
</configuration>
......@@ -120,10 +121,10 @@
</configuration>
<recent_temporary>
<list>
<item itemvalue="npm.buildTS" />
<item itemvalue="npm.build" />
<item itemvalue="npm.flushRes" />
<item itemvalue="npm.dev" />
<item itemvalue="npm.buildTS" />
<item itemvalue="JavaScript Debug.aaa.html" />
</list>
</recent_temporary>
......@@ -197,14 +198,7 @@
<workItem from="1602380089772" duration="7488000" />
<workItem from="1602467369737" duration="13722000" />
<workItem from="1602553054726" duration="8321000" />
<workItem from="1602640287576" duration="4442000" />
</task>
<task id="LOCAL-00043" summary="换了点皮">
<created>1600833548431</created>
<option name="number" value="00043" />
<option name="presentableId" value="LOCAL-00043" />
<option name="project" value="LOCAL" />
<updated>1600833548431</updated>
<workItem from="1602640287576" duration="5927000" />
</task>
<task id="LOCAL-00044" summary="换了点皮">
<created>1600841292605</created>
......@@ -542,7 +536,14 @@
<option name="project" value="LOCAL" />
<updated>1602665024025</updated>
</task>
<option name="localTasksCounter" value="92" />
<task id="LOCAL-00092" summary="礼盒loading引导">
<created>1602665370290</created>
<option name="number" value="00092" />
<option name="presentableId" value="LOCAL-00092" />
<option name="project" value="LOCAL" />
<updated>1602665370290</updated>
</task>
<option name="localTasksCounter" value="93" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -609,51 +610,51 @@
</state>
<state x="250" y="471" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/30.23.1890.1177@30.23.1890.1177" timestamp="1601454738211" />
<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="560" y="183" width="783" height="664" key="CommitChangelistDialog2" timestamp="1602665023767">
<state x="560" y="183" width="783" height="664" key="CommitChangelistDialog2" timestamp="1602665369563">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="557" y="23" key="CommitChangelistDialog2/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472142620" />
<state x="423" y="142" width="783" height="664" key="CommitChangelistDialog2/30.23.1410.877@30.23.1410.877" timestamp="1601389896862" />
<state x="560" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1602665023767" />
<state x="560" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1602665369563" />
<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="63" width="1683" height="1037" key="DiffContextDialog" timestamp="1602321352721">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="131" y="63" width="1683" height="1037" key="DiffContextDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1602321352721" />
<state width="1187" height="321" key="GridCell.Tab.0.bottom" timestamp="1602665069921">
<state width="1187" height="321" key="GridCell.Tab.0.bottom" timestamp="1602666123906">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="877" height="406" key="GridCell.Tab.0.bottom/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154151" />
<state width="1187" height="321" key="GridCell.Tab.0.bottom/30.23.1410.877@30.23.1410.877" timestamp="1602605289405" />
<state width="888" height="321" key="GridCell.Tab.0.bottom/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" />
<state width="1187" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1602665069921" />
<state width="1187" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1602666123906" />
<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="1187" height="321" key="GridCell.Tab.0.center" timestamp="1602665069919">
<state width="1187" height="321" key="GridCell.Tab.0.center" timestamp="1602666123905">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="877" height="406" key="GridCell.Tab.0.center/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154151" />
<state width="1187" height="321" key="GridCell.Tab.0.center/30.23.1410.877@30.23.1410.877" timestamp="1602605289404" />
<state width="888" height="321" key="GridCell.Tab.0.center/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" />
<state width="1187" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1602665069919" />
<state width="1187" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1602666123905" />
<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="1187" height="321" key="GridCell.Tab.0.left" timestamp="1602665069918">
<state width="1187" height="321" key="GridCell.Tab.0.left" timestamp="1602666123905">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="877" height="406" key="GridCell.Tab.0.left/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154150" />
<state width="1187" height="321" key="GridCell.Tab.0.left/30.23.1410.877@30.23.1410.877" timestamp="1602605289403" />
<state width="888" height="321" key="GridCell.Tab.0.left/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" />
<state width="1187" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1602665069918" />
<state width="1187" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1602666123905" />
<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="1187" height="321" key="GridCell.Tab.0.right" timestamp="1602665069920">
<state width="1187" height="321" key="GridCell.Tab.0.right" timestamp="1602666123906">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="877" height="406" key="GridCell.Tab.0.right/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154151" />
<state width="1187" height="321" key="GridCell.Tab.0.right/30.23.1410.877@30.23.1410.877" timestamp="1602605289404" />
<state width="888" height="321" key="GridCell.Tab.0.right/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" />
<state width="1187" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1602665069920" />
<state width="1187" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1602666123906" />
<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">
......@@ -670,12 +671,12 @@
</state>
<state x="762" y="247" key="SettingsEditor/30.23.1890.1177@30.23.1890.1177" timestamp="1602321211804" />
<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="1602665024952">
<state x="91" y="351" key="Vcs.Push.Dialog.v2" timestamp="1602665371479">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="76" y="267" key="Vcs.Push.Dialog.v2/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472144830" />
<state x="76" y="267" key="Vcs.Push.Dialog.v2/30.23.1410.877@30.23.1410.877" timestamp="1601389898667" />
<state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1602665024952" />
<state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1602665371479" />
<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" />
......
output.js
View file @ 71900eb4
......@@ -23850,8 +23850,10 @@ var PlayScene = (function (_super) {
level: this.chapter,
prizeDataType: 1
}, function (success, res) {
if (success && res.data)
if (success && res.data) {
_this.redBombPanelMark = true;
_this.openRedBombPanel();
}
});
}
}
output.js.map
View file @ 71900eb4
This source diff could not be displayed because it is too large. You can view the blob instead.
src/TaoBaoNet.ts
View file @ 71900eb4
......@@ -287,6 +287,11 @@ export function destroyNetData() {
async function fetchAsync(url: string) {
// await response of fetch call
// await new Promise(resolve => {
// setTimeout(()=>{
// resolve();
// }, 500);
// });
let response = await fetch(url);
// only proceed once promise is resolved
let data = await response.json();
......
src/scene/PlayScene.ts
View file @ 71900eb4
......@@ -2721,7 +2721,21 @@ export class PlayScene extends Scene {
*/
openRedBombPanel(callback: Function = null) {
if (this.redBombPanelMark) {
showPanel(FesRedPrizePanel, {callback: callback});
sendTbNet(TbNetName.drawLotteryPrize, {
level: this.chapter,
prizeDataType: 1
},
(success, res) => {
if (success && res.data) {
showPanel(FesRedPrizePanel, {callback: callback});
} else {
callback();
}
}
);
// showPanel(FesRedPrizePanel, {callback: callback});
this.redBombPanelMark = false;
return true;
}
......@@ -2919,19 +2933,26 @@ export class PlayScene extends Scene {
.call(() => {
this.removeChild(eleC);
this.festivalTarget.count--;
});
//完成了，发接口，到时需要修改，对于接口没成功的不设置
if (this.festivalTargetNum <= 0) {
sendTbNet(TbNetName.drawLotteryPrize, {
level: this.chapter,
prizeDataType: 1
},
(success, res) => {
if (success && res.data) this.redBombPanelMark = true;
}
);
this.redBombPanelMark = true;
// sendTbNet(TbNetName.drawLotteryPrize, {
// level: this.chapter,
// prizeDataType: 1
// },
// (success, res) => {
// if (success && res.data) {
// this.redBombPanelMark = true;
// this.openRedBombPanel();
// }
// }
// );
}
}
}
......
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