Skip to content

B
babycare_xiaoxiao
Commit 4a8af0a0 authored by 邱旭's avatar 邱旭
Browse files
Options

m

parent 0b19ecfe
Expand all Show whitespace changes
Inline Side-by-side
Showing with 73 additions and 17 deletions
.idea/workspace.xml
View file @ 4a8af0a0
......@@ -2,7 +2,11 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="0d3cb18d-e144-41a0-bc8b-4877c2e1fef1" name="默认的" comment="">
<change beforePath="$PROJECT_DIR$/src/panels/StartPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/StartPanel.ts" 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.map" beforeDir="false" afterPath="$PROJECT_DIR$/output.js.map" afterDir="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/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" />
......@@ -129,7 +133,7 @@
<workItem from="1612577003915" duration="21094000" />
<workItem from="1612662929222" duration="40609000" />
<workItem from="1613698993022" duration="22309000" />
<workItem from="1613785579125" duration="14775000" />
<workItem from="1613785579125" duration="16149000" />
</task>
<task id="LOCAL-00001" summary="斐乐消消乐">
<created>1612581213298</created>
......@@ -376,7 +380,14 @@
<option name="project" value="LOCAL" />
<updated>1613812844199</updated>
</task>
<option name="localTasksCounter" value="36" />
<task id="LOCAL-00036" summary="m">
<created>1613812861760</created>
<option name="number" value="00036" />
<option name="presentableId" value="LOCAL-00036" />
<option name="project" value="LOCAL" />
<updated>1613812861760</updated>
</task>
<option name="localTasksCounter" value="37" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......
output.js
View file @ 4a8af0a0
......@@ -7837,6 +7837,7 @@ var TbNetName;
TbNetName["getRemainTimes"] = "feile.getRemainTimes";
TbNetName["getActivityBaseInfoById"] = "feile.getActivityBaseInfoById";
TbNetName["updateActivityInfo"] = "mine.updateActivityInfo";
TbNetName["openMember"] = "mine.openMember";
TbNetName["getToolsInfo"] = "feile.getToolsInfo";
TbNetName["consumerTools"] = "feile.consumerTools";
TbNetName["dojoin"] = "feile.doJoin";
......@@ -8027,7 +8028,6 @@ var Tools = (function () {
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.getActivityBaseInfoById, {}, function (s, res) {
if (s) {
_this.gameData = res.data;
console.log(1111);
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.updateActivityInfo, { data: JSON.parse(JSON.stringify(res.data)) });
Tools.gameData.prizeLevels = [];
for (var k in Tools.gameData.levelPrize) {
......@@ -11773,6 +11773,42 @@ var __extends = (this && this.__extends) || (function () {
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
})();
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
var __generator = (this && this.__generator) || function (thisArg, body) {
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
function verb(n) { return function (v) { return step([n, v]); }; }
function step(op) {
if (f) throw new TypeError("Generator is already executing.");
while (_) try {
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
if (y = 0, t) op = [op[0] & 2, t.value];
switch (op[0]) {
case 0: case 1: t = op; break;
case 4: _.label++; return { value: op[1], done: false };
case 5: _.label++; y = op[1]; op = [0]; continue;
case 7: op = _.ops.pop(); _.trys.pop(); continue;
default:
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
if (t[2]) _.ops.pop();
_.trys.pop(); continue;
}
op = body.call(thisArg, _);
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
}
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.StartTargetItem = exports.StartTarget = exports.StartPanel = void 0;
var Panel_1 = __webpack_require__(/*! ../../module/views/Panel */ "./module/views/Panel.ts");
......@@ -11861,13 +11897,23 @@ var StartPanel = (function (_super) {
this.hidePanel();
return;
}
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.dojoin, { level: this.data.level }, function (success, res) {
_this.enableMouseEvt(true);
if (!success)
return;
ctrls_1.changeScene(PlayScene_1.PlayScene, { chapter: _this.data.level });
_this.hidePanel();
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.dojoin, { level: this.data.level }, function (success, res) { return __awaiter(_this, void 0, void 0, function () {
return __generator(this, function (_a) {
this.enableMouseEvt(true);
if (!success) {
if (res.data && !res.data.isvip) {
ctrls_1.showToast('请入会后参与');
setTimeout(function () {
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.openMember);
}, 1500);
}
return [2];
}
ctrls_1.changeScene(PlayScene_1.PlayScene, { chapter: this.data.level });
this.hidePanel();
return [2];
});
}); });
};
return StartPanel;
}(Panel_1.Panel));
......@@ -12506,6 +12552,7 @@ var LoadingScene = (function (_super) {
if (pro >= 1) {
_this.removeEventListener(FYGE.Event.PROGRESS, _this.progressEvent, _this);
ctrls_1.changeScene(MapScene_1.MapScene, { from: "loading" });
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.openMusic, { isOn: true });
}
});
};
......@@ -14787,8 +14834,6 @@ var MusicBtn = (function (_super) {
_this.texture = RES_1.RES.getRes(isOn ? "musicOn.png" : "musicOff.png");
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.openMusic, { isOn: isOn });
}, _this);
if (isOn)
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.openMusic, { isOn: true });
Main_1.GDispatcher.addEventListener(G_EVENT_1.G_EVENT.ON_SHOW, _this.onShow, _this);
return _this;
}
......@@ -14797,7 +14842,6 @@ var MusicBtn = (function (_super) {
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.openMusic, { isOn: true });
};
MusicBtn.prototype.destroy = function () {
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.openMusic, { isOn: false });
Main_1.GDispatcher.removeEventListener(G_EVENT_1.G_EVENT.ON_SHOW, this.onShow, this);
_super.prototype.destroy.call(this);
};
output.js.map
View file @ 4a8af0a0
This diff is collapsed.
src/scene/LoadingScene.ts
View file @ 4a8af0a0
......@@ -99,6 +99,7 @@ export class LoadingScene extends Scene {
if (pro >= 1) {
this.removeEventListener(FYGE.Event.PROGRESS, this.progressEvent, this);
changeScene(MapScene, {from: "loading"});
sendTbNet(TbNetName.openMusic, { isOn: true });
// showPanel(LotteryPanel);
// changeScene(PlayScene, { chapter: 1 });
// changeScene(LotteryScene,{level:1});
......
src/scene/PlayScene.ts
View file @ 4a8af0a0
......@@ -2898,7 +2898,7 @@ class MusicBtn extends FYGE.Sprite {
}, this);
//默认开启
// this.isOn = true;
if (isOn) sendTbNet(TbNetName.openMusic, { isOn: true })
// if (isOn) sendTbNet(TbNetName.openMusic, { isOn: true })
//添加onSHow事件
GDispatcher.addEventListener(G_EVENT.ON_SHOW, this.onShow, this)
}
......@@ -2906,7 +2906,7 @@ class MusicBtn extends FYGE.Sprite {
if (isOn) sendTbNet(TbNetName.openMusic, { isOn: true })
}
destroy() {
sendTbNet(TbNetName.openMusic, { isOn: false })
// sendTbNet(TbNetName.openMusic, { isOn: false })
GDispatcher.removeEventListener(G_EVENT.ON_SHOW, this.onShow, this)
super.destroy()
}
......
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