Skip to content

B
babycare_xiaoxiao
Commit 48e001dc authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

1111

parent b8bf0b2f
Show whitespace changes
Inline Side-by-side
Showing with 40 additions and 18 deletions
.idea/workspace.xml
View file @ 48e001dc
......@@ -3,7 +3,11 @@
<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.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$/src/panels/FailedPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/FailedPanel.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/scene/map/CheckBtn.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/CheckBtn.ts" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -43,7 +47,7 @@
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="nodejs_package_manager_path" value="npm" />
<property name="run.code.analysis.last.selected.profile" value="pProject Default" />
<property name="settings.editor.selected.configurable" value="yiiguxing.plugin.translate" />
<property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
<property name="ts.external.directory.path" value="$PROJECT_DIR$/node_modules/typescript/lib" />
</component>
<component name="RecentsManager">
......@@ -119,7 +123,13 @@
<workItem from="1595815330125" duration="170000" />
<workItem from="1595815541868" duration="600000" />
<workItem from="1595820295687" duration="20176000" />
<workItem from="1596009802360" duration="2814000" />
<workItem from="1596009802360" duration="3489000" />
<workItem from="1596077213464" duration="597000" />
<workItem from="1596078246715" duration="308000" />
<workItem from="1596078765271" duration="130000" />
<workItem from="1596079211888" duration="5000" />
<workItem from="1596079246036" duration="1000" />
<workItem from="1596079283722" duration="1579000" />
</task>
<task id="LOCAL-00001" summary="111">
<created>1594122339119</created>
......@@ -420,28 +430,28 @@
</state>
<state x="557" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1595928130768" />
<state x="558" y="183" width="884" height="891" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1595584297912" />
<state width="883" height="321" key="GridCell.Tab.0.bottom" timestamp="1596073501008">
<state width="883" height="321" key="GridCell.Tab.0.bottom" timestamp="1596079345732">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="883" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1596073501008" />
<state width="883" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1596079345732" />
<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="883" height="321" key="GridCell.Tab.0.center" timestamp="1596073501007">
<state width="883" height="321" key="GridCell.Tab.0.center" timestamp="1596079345730">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="883" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1596073501007" />
<state width="883" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1596079345730" />
<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="883" height="321" key="GridCell.Tab.0.left" timestamp="1596073501005">
<state width="883" height="321" key="GridCell.Tab.0.left" timestamp="1596079345728">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="883" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1596073501005" />
<state width="883" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1596079345728" />
<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="883" height="321" key="GridCell.Tab.0.right" timestamp="1596073501008">
<state width="883" height="321" key="GridCell.Tab.0.right" timestamp="1596079345731">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="883" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1596073501008" />
<state width="883" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1596079345731" />
<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">
......@@ -453,9 +463,10 @@
</state>
<state x="209" y="320" key="RollbackChangesDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1596074500976" />
<state x="210" y="320" key="RollbackChangesDialog/31.23.1889.1177@31.23.1889.1177" timestamp="1594173186663" />
<state x="300" y="248" key="SettingsEditor" timestamp="1594798992724">
<screen x="31" y="23" width="1889" height="1177" />
<state x="289" y="314" key="SettingsEditor" timestamp="1596079390860">
<screen x="30" y="23" width="1890" height="1177" />
</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="1595928132038">
<screen x="30" y="23" width="1890" height="1177" />
......@@ -487,10 +498,10 @@
<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="1595475548860" />
<state x="639" y="288" width="671" height="676" key="search.everywhere.popup" timestamp="1596076340751">
<state x="639" y="288" width="671" height="676" key="search.everywhere.popup" timestamp="1596080600958">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="639" y="288" width="671" height="676" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1596076340751" />
<state x="639" y="288" width="671" height="676" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1596080600958" />
<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/babycare.gameOver.json
View file @ 48e001dc
......@@ -4,10 +4,10 @@
"currentLevel": 11,
"isPrizeLevel": false,
"tool": {
"type": "HAMMERS",
"image": "https://img.alicdn.com/imgextra/i1/2275046294/O1CN01xTeKMI1wMhRux48Y6_!!2275046294-2-miniprogram.png"
},
"prize": {
"type": "HAMMERS"
}
},
"success": true,
......
mock/miniTb/babycare.getIndex.json
View file @ 48e001dc
......@@ -40,7 +40,7 @@
],
"visitors": [
{
"level": 118,
"level": 120,
"scores": 44444,
"stars": 2,
"isPrizeLevel": false,
......
src/panels/FailedPanel.ts
View file @ 48e001dc
......@@ -39,6 +39,12 @@ export class FailedPanel extends Panel {
this.tipsTex.textAlign = TEXT_ALIGN.CENTER;
this.tipsTex.textWidth = 750;
this.tipsTex.x = 0;
if (Tools.gameData.currentLevel == 120
&& MapScene.checkArr && MapScene.checkArr[120]
&& MapScene.checkArr[120].checkData.isVisitSuccess) {
this.tipsTex.text = '';
}
}
start(data) {
......
src/panels/SuccessNoPrizePanel.ts
View file @ 48e001dc
......@@ -68,8 +68,13 @@ export class SuccessNoPrizePanel extends Panel {
this.totalContinueBtn.visible = false;
}
// if(MapScene.checkArr && MapScene.checkArr[120] && MapScene.checkArr[120])
if (MapScene.checkArr && MapScene.checkArr[this.data.level] && MapScene.checkArr[this.data.level].sendAwardType) {
if (Tools.gameData.currentLevel == 120
&& MapScene.checkArr && MapScene.checkArr[120]
&& MapScene.checkArr[120].checkData.isVisitSuccess) {
this.tipsTex.text = '';
} else if (MapScene.checkArr && MapScene.checkArr[this.data.level] && MapScene.checkArr[this.data.level].sendAwardType) {
// 到过三星，领过奖
const curLevel: number = Tools.gameData.currentLevel;
let upLevel: number = 120;
......
src/scene/map/CheckBtn.ts
View file @ 48e001dc
......@@ -22,7 +22,7 @@ export enum CHECK_TYPE {
export default class CheckBtn extends Container {
private checkData: {
public checkData: {
level: number,
scores: number,
stars: number,
......
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