Commit 275c1bc1 authored by 邱旭's avatar 邱旭

m

parent 7882d1ae
...@@ -5,12 +5,9 @@ ...@@ -5,12 +5,9 @@
<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/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/TaoBaoNet.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/TaoBaoNet.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Tools.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/Tools.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/log.ts" beforeDir="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/panels/StartPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/StartPanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/PlayScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/PlayScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapUI.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapUI.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" />
...@@ -141,7 +138,7 @@ ...@@ -141,7 +138,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="6983000" /> <workItem from="1613698993022" duration="7452000" />
</task> </task>
<task id="LOCAL-00001" summary="斐乐消消乐"> <task id="LOCAL-00001" summary="斐乐消消乐">
<created>1612581213298</created> <created>1612581213298</created>
...@@ -262,7 +259,14 @@ ...@@ -262,7 +259,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1613703466149</updated> <updated>1613703466149</updated>
</task> </task>
<option name="localTasksCounter" value="18" /> <task id="LOCAL-00018" summary="m">
<created>1613706401083</created>
<option name="number" value="00018" />
<option name="presentableId" value="LOCAL-00018" />
<option name="project" value="LOCAL" />
<updated>1613706401083</updated>
</task>
<option name="localTasksCounter" value="19" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
......
...@@ -8025,15 +8025,25 @@ var Tools = (function () { ...@@ -8025,15 +8025,25 @@ var Tools = (function () {
}); });
}; };
Tools.consumerTools = function (type) { Tools.consumerTools = function (type) {
var _this = this;
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.consumerTools, { type: type }, function (s, res) { TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.consumerTools, { type: type }, function (s, res) { return __awaiter(_this, void 0, void 0, function () {
if (s) { return __generator(this, function (_a) {
resolve(true); switch (_a.label) {
} case 0:
else { if (!s) return [3, 2];
resolve(false); return [4, Tools.updateTools()];
} case 1:
}); _a.sent();
resolve(true);
return [3, 3];
case 2:
resolve(false);
_a.label = 3;
case 3: return [2];
}
});
}); });
}); });
}; };
Tools.updateTools = function () { Tools.updateTools = function () {
...@@ -13005,15 +13015,10 @@ var PlayScene = (function (_super) { ...@@ -13005,15 +13015,10 @@ var PlayScene = (function (_super) {
PlayScene.prototype.updateScene = function () { PlayScene.prototype.updateScene = function () {
return __awaiter(this, void 0, void 0, function () { return __awaiter(this, void 0, void 0, function () {
return __generator(this, function (_a) { return __generator(this, function (_a) {
switch (_a.label) { this.propBtnCon.boomCount = Tools_1.Tools.gameData.tools.booms;
case 0: return [4, Tools_1.Tools.updateTools()]; this.propBtnCon.hammerCount = Tools_1.Tools.gameData.tools.hammers;
case 1: this.propBtnCon.stepCount = Tools_1.Tools.gameData.tools.steps;
_a.sent(); return [2];
this.propBtnCon.boomCount = Tools_1.Tools.gameData.tools.booms;
this.propBtnCon.hammerCount = Tools_1.Tools.gameData.tools.hammers;
this.propBtnCon.stepCount = Tools_1.Tools.gameData.tools.steps;
return [2];
}
}); });
}); });
}; };
This diff is collapsed.
...@@ -9,7 +9,7 @@ export enum TbNetName { ...@@ -9,7 +9,7 @@ export enum TbNetName {
* 埋点统计 到时改名字 * 埋点统计 到时改名字
* activityId params elemType * activityId params elemType
*/ */
trackingReport = "squirrelsAdoptRest2c.trackingReport", addStats = "feile.addStats",
// 领取权益奖励 // 领取权益奖励
receiveEnamePrize = "babycare.receiveEnamePrize", receiveEnamePrize = "babycare.receiveEnamePrize",
......
import { sendTbNet, TbNetName } from "./TaoBaoNet";
/**
* 曝光埋点
* @param elemType
*/
// export function showLog(elemType: string) {
// sendTbNet(TbNetName.trackingReport, { params: { elemType }, type: "exposure" }, () => { }, true)
// //淘宝自定义埋点
// sendTbNet(TbNetName.reportAnalytics, { logkey: elemType }, () => { }, true)
// }
export enum LogEnum {
AD = "ad",
TASK_ICON = 'taskIcon',
FOLLOW_SHOP = 'followShop',
INVITE_FRIEND = 'inviteFriend',
BROWSE_PRODUCT = 'browseProduct',
COLLECTION_PRODUCT = 'collectionProduct',
BUY_PRODUCT = 'buyProduct',
IMPROVE_INFORMATION = 'improveInformation',
SECRET_ORDER = 'secretOrder',
SIGN_ICON = 'signIcon',
BAG_ICON = 'bagIcon',
}
/**
* 点击埋点,自定义字段,
* @param elemType
*/
export function clickLog(elemType: LogEnum) {
sendTbNet(TbNetName.trackingReport, { params: { elemType }, type: "click" }, () => { }, true)
//淘宝自定义埋点
sendTbNet(TbNetName.reportAnalytics, { logkey: elemType }, () => { }, true)
}
...@@ -87,6 +87,7 @@ export class StartPanel extends Panel { ...@@ -87,6 +87,7 @@ export class StartPanel extends Panel {
} }
private startGame() { private startGame() {
sendTbNet(TbNetName.addStats, { type: "CLICK_DOJOIN" }, () => 0, true);
this.enableMouseEvt(false); this.enableMouseEvt(false);
if (!this.data.isPlayed && Tools.gameData.power <= 0) {// 体力不足 if (!this.data.isPlayed && Tools.gameData.power <= 0) {// 体力不足
showPanel(NoEnergyPanel); showPanel(NoEnergyPanel);
...@@ -94,13 +95,13 @@ export class StartPanel extends Panel { ...@@ -94,13 +95,13 @@ export class StartPanel extends Panel {
this.hidePanel(); this.hidePanel();
return; return;
} }
sendTbNet(TbNetName.dojoin, {level: this.data.level}, sendTbNet(TbNetName.dojoin, { level: this.data.level },
(success, res) => { (success, res) => {
this.enableMouseEvt(true); this.enableMouseEvt(true);
if (!success) return; if (!success) return;
// Tools.gameData.power = res.data.power; // Tools.gameData.power = res.data.power;
changeScene(PlayScene, {chapter: this.data.level}); changeScene(PlayScene, { chapter: this.data.level });
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