Commit 9d8779cd authored by 邱旭's avatar 邱旭

m

parent 275c1bc1
...@@ -5,8 +5,7 @@ ...@@ -5,8 +5,7 @@
<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$/output.js" beforeDir="false" afterPath="$PROJECT_DIR$/output.js" 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$/output.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/output.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TaoBaoNet.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/TaoBaoNet.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/log.ts" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/StartPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/StartPanel.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/panels/StartPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/StartPanel.ts" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -138,7 +137,7 @@ ...@@ -138,7 +137,7 @@
<workItem from="1612576979459" duration="13000" /> <workItem from="1612576979459" duration="13000" />
<workItem from="1612577003915" duration="21094000" /> <workItem from="1612577003915" duration="21094000" />
<workItem from="1612662929222" duration="40609000" /> <workItem from="1612662929222" duration="40609000" />
<workItem from="1613698993022" duration="7452000" /> <workItem from="1613698993022" duration="7731000" />
</task> </task>
<task id="LOCAL-00001" summary="斐乐消消乐"> <task id="LOCAL-00001" summary="斐乐消消乐">
<created>1612581213298</created> <created>1612581213298</created>
...@@ -266,7 +265,14 @@ ...@@ -266,7 +265,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1613706401083</updated> <updated>1613706401083</updated>
</task> </task>
<option name="localTasksCounter" value="19" /> <task id="LOCAL-00019" summary="m">
<created>1613706865023</created>
<option name="number" value="00019" />
<option name="presentableId" value="LOCAL-00019" />
<option name="project" value="LOCAL" />
<updated>1613706865023</updated>
</task>
<option name="localTasksCounter" value="20" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
......
...@@ -7821,7 +7821,7 @@ var ctrls_1 = __webpack_require__(/*! ../module/ctrls */ "./module/ctrls/index.t ...@@ -7821,7 +7821,7 @@ var ctrls_1 = __webpack_require__(/*! ../module/ctrls */ "./module/ctrls/index.t
var Main_1 = __webpack_require__(/*! ./Main */ "./src/Main.ts"); var Main_1 = __webpack_require__(/*! ./Main */ "./src/Main.ts");
var TbNetName; var TbNetName;
(function (TbNetName) { (function (TbNetName) {
TbNetName["trackingReport"] = "squirrelsAdoptRest2c.trackingReport"; TbNetName["addStats"] = "feile.addStats";
TbNetName["receiveEnamePrize"] = "babycare.receiveEnamePrize"; TbNetName["receiveEnamePrize"] = "babycare.receiveEnamePrize";
TbNetName["getActivityBaseInfoById"] = "feile.getActivityBaseInfoById"; TbNetName["getActivityBaseInfoById"] = "feile.getActivityBaseInfoById";
TbNetName["getToolsInfo"] = "feile.getToolsInfo"; TbNetName["getToolsInfo"] = "feile.getToolsInfo";
...@@ -11488,7 +11488,6 @@ var NoEnergyPanel = (function (_super) { ...@@ -11488,7 +11488,6 @@ var NoEnergyPanel = (function (_super) {
this.addChild(new Button(RES_1.RES.getRes('关闭按钮.png'))) this.addChild(new Button(RES_1.RES.getRes('关闭按钮.png')))
.addEventListener(MouseEvent.CLICK, function () { .addEventListener(MouseEvent.CLICK, function () {
_this.hidePanel(); _this.hidePanel();
_this.data.cancel();
}, this) }, this)
.position.set(640, 494); .position.set(640, 494);
}; };
...@@ -11771,8 +11770,9 @@ var StartPanel = (function (_super) { ...@@ -11771,8 +11770,9 @@ var StartPanel = (function (_super) {
}; };
StartPanel.prototype.startGame = function () { StartPanel.prototype.startGame = function () {
var _this = this; var _this = this;
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.addStats, { type: "CLICK_DOJOIN" }, function () { return 0; }, true);
this.enableMouseEvt(false); this.enableMouseEvt(false);
if (!this.data.isPlayed && Tools_1.Tools.gameData.power <= 0) { if (Tools_1.Tools.gameData.power <= 0) {
ctrls_1.showPanel(NoEnergyPanel_1.NoEnergyPanel); ctrls_1.showPanel(NoEnergyPanel_1.NoEnergyPanel);
this.enableMouseEvt(true); this.enableMouseEvt(true);
this.hidePanel(); this.hidePanel();
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -21,7 +21,6 @@ export class NoEnergyPanel extends Panel { ...@@ -21,7 +21,6 @@ export class NoEnergyPanel extends Panel {
this.addChild(new Button(RES.getRes('关闭按钮.png'))) this.addChild(new Button(RES.getRes('关闭按钮.png')))
.addEventListener(MouseEvent.CLICK, () => { .addEventListener(MouseEvent.CLICK, () => {
this.hidePanel(); this.hidePanel();
this.data.cancel();
}, this) }, this)
.position.set(640, 494); .position.set(640, 494);
} }
......
...@@ -89,7 +89,7 @@ export class StartPanel extends Panel { ...@@ -89,7 +89,7 @@ export class StartPanel extends Panel {
private startGame() { private startGame() {
sendTbNet(TbNetName.addStats, { type: "CLICK_DOJOIN" }, () => 0, true); sendTbNet(TbNetName.addStats, { type: "CLICK_DOJOIN" }, () => 0, true);
this.enableMouseEvt(false); this.enableMouseEvt(false);
if (!this.data.isPlayed && Tools.gameData.power <= 0) {// 体力不足 if (Tools.gameData.power <= 0) {// 体力不足
showPanel(NoEnergyPanel); showPanel(NoEnergyPanel);
this.enableMouseEvt(true); this.enableMouseEvt(true);
this.hidePanel(); this.hidePanel();
......
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