Commit dfe9c6c7 authored by 邱旭's avatar 邱旭

m

parent 0e70feba
...@@ -3,7 +3,9 @@ ...@@ -3,7 +3,9 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="0d3cb18d-e144-41a0-bc8b-4877c2e1fef1" name="默认的" comment=""> <list default="true" id="0d3cb18d-e144-41a0-bc8b-4877c2e1fef1" name="默认的" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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$/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/Tools.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/Tools.ts" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -62,7 +64,7 @@ ...@@ -62,7 +64,7 @@
<recent name="$PROJECT_DIR$/lotties" /> <recent name="$PROJECT_DIR$/lotties" />
</key> </key>
</component> </component>
<component name="RunManager" selected="npm.build"> <component name="RunManager" selected="npm.buildTS">
<configuration name="build" type="js.build_tools.npm" temporary="true" nameIsGenerated="true"> <configuration name="build" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
<package-json value="$PROJECT_DIR$/package.json" /> <package-json value="$PROJECT_DIR$/package.json" />
<command value="run" /> <command value="run" />
...@@ -111,10 +113,10 @@ ...@@ -111,10 +113,10 @@
</list> </list>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="npm.buildTS" />
<item itemvalue="npm.build" /> <item itemvalue="npm.build" />
<item itemvalue="npm.dev" /> <item itemvalue="npm.dev" />
<item itemvalue="npm.flushRes" /> <item itemvalue="npm.flushRes" />
<item itemvalue="npm.buildTS" />
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
...@@ -131,7 +133,7 @@ ...@@ -131,7 +133,7 @@
<workItem from="1612662929222" duration="40609000" /> <workItem from="1612662929222" duration="40609000" />
<workItem from="1613698993022" duration="22309000" /> <workItem from="1613698993022" duration="22309000" />
<workItem from="1613785579125" duration="17751000" /> <workItem from="1613785579125" duration="17751000" />
<workItem from="1613958457445" duration="6026000" /> <workItem from="1613958457445" duration="6710000" />
</task> </task>
<task id="LOCAL-00001" summary="斐乐消消乐"> <task id="LOCAL-00001" summary="斐乐消消乐">
<created>1612581213298</created> <created>1612581213298</created>
...@@ -420,7 +422,14 @@ ...@@ -420,7 +422,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1614046524319</updated> <updated>1614046524319</updated>
</task> </task>
<option name="localTasksCounter" value="42" /> <task id="LOCAL-00042" summary="m">
<created>1614048624668</created>
<option name="number" value="00042" />
<option name="presentableId" value="LOCAL-00042" />
<option name="project" value="LOCAL" />
<updated>1614048624668</updated>
</task>
<option name="localTasksCounter" value="43" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
......
...@@ -15629,7 +15629,7 @@ var MapUI = (function (_super) { ...@@ -15629,7 +15629,7 @@ var MapUI = (function (_super) {
ctrls_1.showPanel(RulePanel_1.RulePanel); ctrls_1.showPanel(RulePanel_1.RulePanel);
break; break;
case this.myPrizeBtn: case this.myPrizeBtn:
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.navigateTo, { url: '/pages/myPrize/myPrize' }, function () { TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.navigateTo, { url: '/pages/myprize/myprize' }, function () {
}, true); }, true);
break; break;
case this.taskBtn: case this.taskBtn:
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -141,15 +141,15 @@ export class Tools { ...@@ -141,15 +141,15 @@ export class Tools {
} }
public static gameOver(data) { public static gameOver(data) {
if (data.level == Tools.maxLevel) { // 99肯定是抽奖机会 if (!data.isVisitSuccess) { // 闯关失败
showPanel(SuccessNoPrizePanel, data); showPanel(FailedPanel, data);
} else if (!data.isVisitSuccess) { // 闯关失败 } else if (data.level == Tools.maxLevel) { // 99肯定是抽奖机会
showPanel(FailedPanel, data); showPanel(SuccessNoPrizePanel, data);
} else if (data.prize && data.prize.type != 5) { // 闯关成功,奖励关卡 } else if (data.prize && data.prize.type != 5) { // 闯关成功,奖励关卡
showPanel(SuccessPrizePanel, data); showPanel(SuccessPrizePanel, data);
} else { // 闯关成功,不是奖励关卡 } else { // 闯关成功,不是奖励关卡
showPanel(SuccessNoPrizePanel, data); showPanel(SuccessNoPrizePanel, data);
} }
} }
/** /**
......
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