Commit 6e4e6a56 authored by haiyoucuv's avatar haiyoucuv

1

parent 789514fd
......@@ -3,12 +3,7 @@
<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$/aaa.html" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.getActivityBaseInfoById.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/popmartXXL2c.getActivityBaseInfoById.json" 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/ResJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ResJson.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Main.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/Main.ts" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -76,7 +71,7 @@
<recent name="$PROJECT_DIR$/src/panels" />
</key>
</component>
<component name="RunManager" selected="npm.buildTS">
<component name="RunManager" selected="npm.dev">
<configuration name="aaa.html" type="JavascriptDebugType" temporary="true" nameIsGenerated="true" uri="http://localhost:63342/ppmt_xxl/aaa.html" useBuiltInWebServerPort="true">
<method v="2" />
</configuration>
......@@ -123,9 +118,9 @@
</configuration>
<recent_temporary>
<list>
<item itemvalue="npm.dev" />
<item itemvalue="npm.buildTS" />
<item itemvalue="npm.build" />
<item itemvalue="npm.dev" />
<item itemvalue="JavaScript Debug.aaa.html" />
<item itemvalue="npm.flushRes" />
</list>
......@@ -182,13 +177,15 @@
<workItem from="1601867080494" duration="7391000" />
<workItem from="1601947398596" duration="7234000" />
<workItem from="1602034622133" duration="5900000" />
</task>
<task id="LOCAL-00026" summary="Success Panel Effect!">
<created>1595314404681</created>
<option name="number" value="00026" />
<option name="presentableId" value="LOCAL-00026" />
<option name="project" value="LOCAL" />
<updated>1595314404681</updated>
<workItem from="1602054272734" duration="6510000" />
<workItem from="1602208357340" duration="335000" />
<workItem from="1602208794813" duration="158000" />
<workItem from="1602209018768" duration="16000" />
<workItem from="1602209059215" duration="537000" />
<workItem from="1602209675358" duration="5000" />
<workItem from="1602209777393" duration="77000" />
<workItem from="1602209986890" duration="55000" />
<workItem from="1602210165129" duration="103000" />
</task>
<task id="LOCAL-00027" summary="Success Panel Effect!">
<created>1595315161168</created>
......@@ -526,7 +523,14 @@
<option name="project" value="LOCAL" />
<updated>1601879805457</updated>
</task>
<option name="localTasksCounter" value="75" />
<task id="LOCAL-00075" summary="task">
<created>1602054637014</created>
<option name="number" value="00075" />
<option name="presentableId" value="LOCAL-00075" />
<option name="project" value="LOCAL" />
<updated>1602054637015</updated>
</task>
<option name="localTasksCounter" value="76" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -571,6 +575,10 @@
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="440" y="273" key="#com.intellij.execution.impl.EditConfigurationsDialog/31.23.1889.1177@31.23.1889.1177" timestamp="1595229546530" />
<state x="271" y="419" key="#com.intellij.fileTypes.FileTypeChooser" timestamp="1602058390101">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="271" y="419" key="#com.intellij.fileTypes.FileTypeChooser/30.23.1890.1177@30.23.1890.1177" timestamp="1602058390101" />
<state x="131" y="385" key="#com.intellij.ide.fileTemplates.ui.ConfigureTemplatesDialog" timestamp="1601791476050">
<screen x="30" y="23" width="1890" height="1177" />
</state>
......@@ -584,51 +592,51 @@
</state>
<state x="250" y="471" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/30.23.1890.1177@30.23.1890.1177" timestamp="1601454738211" />
<state x="251" y="471" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/31.23.1889.1177@31.23.1889.1177" timestamp="1594113080922" />
<state x="557" y="183" width="783" height="664" key="CommitChangelistDialog2" timestamp="1601879805281">
<state x="557" y="183" width="783" height="664" key="CommitChangelistDialog2" timestamp="1602054636257">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="557" y="23" key="CommitChangelistDialog2/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472142620" />
<state x="423" y="142" width="783" height="664" key="CommitChangelistDialog2/30.23.1410.877@30.23.1410.877" timestamp="1601389896862" />
<state x="557" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1601879805281" />
<state x="557" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1602054636257" />
<state x="558" y="183" width="884" height="891" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1595584297912" />
<state x="131" y="123" width="730" height="977" key="DiffContextDialog" timestamp="1596165868169">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="131" y="123" width="730" height="977" key="DiffContextDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1596165868169" />
<state width="905" height="321" key="GridCell.Tab.0.bottom" timestamp="1602054235105">
<state width="905" height="321" key="GridCell.Tab.0.bottom" timestamp="1602208364985">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="877" height="406" key="GridCell.Tab.0.bottom/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154151" />
<state width="905" height="321" key="GridCell.Tab.0.bottom/30.23.1410.877@30.23.1410.877" timestamp="1601914214384" />
<state width="888" height="321" key="GridCell.Tab.0.bottom/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" />
<state width="905" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1602054235105" />
<state width="905" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1602208364985" />
<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="905" height="321" key="GridCell.Tab.0.center" timestamp="1602054235104">
<state width="905" height="321" key="GridCell.Tab.0.center" timestamp="1602208364984">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="877" height="406" key="GridCell.Tab.0.center/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154151" />
<state width="905" height="321" key="GridCell.Tab.0.center/30.23.1410.877@30.23.1410.877" timestamp="1601914214382" />
<state width="888" height="321" key="GridCell.Tab.0.center/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" />
<state width="905" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1602054235104" />
<state width="905" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1602208364984" />
<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="905" height="321" key="GridCell.Tab.0.left" timestamp="1602054235104">
<state width="905" height="321" key="GridCell.Tab.0.left" timestamp="1602208364983">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="877" height="406" key="GridCell.Tab.0.left/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154150" />
<state width="905" height="321" key="GridCell.Tab.0.left/30.23.1410.877@30.23.1410.877" timestamp="1601914214382" />
<state width="888" height="321" key="GridCell.Tab.0.left/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" />
<state width="905" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1602054235104" />
<state width="905" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1602208364983" />
<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="905" height="321" key="GridCell.Tab.0.right" timestamp="1602054235104">
<state width="905" height="321" key="GridCell.Tab.0.right" timestamp="1602208364984">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state width="877" height="406" key="GridCell.Tab.0.right/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472154151" />
<state width="905" height="321" key="GridCell.Tab.0.right/30.23.1410.877@30.23.1410.877" timestamp="1601914214383" />
<state width="888" height="321" key="GridCell.Tab.0.right/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" />
<state width="905" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1602054235104" />
<state width="905" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1602208364984" />
<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">
......@@ -645,12 +653,12 @@
</state>
<state x="98" y="219" key="SettingsEditor/30.23.1890.1177@30.23.1890.1177" timestamp="1601791580605" />
<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="1601879808335">
<state x="91" y="351" key="Vcs.Push.Dialog.v2" timestamp="1602054639710">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="76" y="267" key="Vcs.Push.Dialog.v2/30.23.1410.877/1440.23.1920.1177@30.23.1410.877" timestamp="1601472144830" />
<state x="76" y="267" key="Vcs.Push.Dialog.v2/30.23.1410.877@30.23.1410.877" timestamp="1601389898667" />
<state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1601879808335" />
<state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1602054639710" />
<state x="92" y="351" key="Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177" timestamp="1595584299423" />
<state x="87" y="216" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1594705166397">
<screen x="31" y="23" width="1889" height="1177" />
......@@ -660,10 +668,10 @@
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="302" y="531" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/30.23.1890.1177@30.23.1890.1177" timestamp="1601706713549" />
<state x="979" y="23" width="676" height="1158" key="dock-window-1" timestamp="1601878543815">
<state x="979" y="23" width="676" height="1158" key="dock-window-1" timestamp="1602058469650">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="979" y="23" width="676" height="1158" key="dock-window-1/30.23.1890.1177@30.23.1890.1177" timestamp="1601878543815" />
<state x="979" y="23" width="676" height="1158" key="dock-window-1/30.23.1890.1177@30.23.1890.1177" timestamp="1602058469650" />
<state x="280" y="23" width="879" height="1158" key="dock-window-1/31.23.1889.1177@31.23.1889.1177" timestamp="1595227066273" />
<state x="588" y="23" width="949" height="1177" key="dock-window-2" timestamp="1601015282397">
<screen x="30" y="23" width="1890" height="1177" />
......
......@@ -17,8 +17,8 @@
"beMemberUrl": "https://www.baidu.com",
"rewards": 10,
"todayCompleteTimes": 2,
"totalTimes": 5,
"waitReceiveTimes": 10
"totalTimes": 2,
"waitReceiveTimes": 0
},
{
"taskType": "orderGoods",
......@@ -32,17 +32,17 @@
"taskType": "follow",
"beMemberUrl": "https://www.baidu.com",
"rewards": 10,
"todayCompleteTimes": 2,
"totalTimes": 5,
"waitReceiveTimes": 10
"todayCompleteTimes": 1,
"totalTimes": 1,
"waitReceiveTimes": 0
},
{
"taskType": "member",
"beMemberUrl": "https://www.baidu.com",
"rewards": 10,
"todayCompleteTimes": 2,
"totalTimes": 5,
"waitReceiveTimes": 10
"todayCompleteTimes": 1,
"totalTimes": 1,
"waitReceiveTimes": 0
}
]
}
......
......@@ -12702,7 +12702,7 @@ exports.ResJson = {
}
}
],
"path": "https://yun.duiba.com.cn/db_games/activity/babycare_xiaoxiao/1602039378/resource/"
"path": "https://yun.duiba.com.cn/db_games/activity/babycare_xiaoxiao/1602212094/resource/"
};
......@@ -13325,6 +13325,7 @@ var TbNetName;
TbNetName["trackingReport"] = "squirrelsAdoptRest2c.trackingReport";
TbNetName["receiveEnamePrize"] = "popmartXXL2c.receiveEnamePrize";
TbNetName["drawLotteryPrize"] = "popmartXXL2c.drawLotteryPrize";
TbNetName["doHelp"] = "popmartXXL2c.doHelp";
TbNetName["getActivityBaseInfoById"] = "popmartXXL2c.getActivityBaseInfoById";
TbNetName["consumerTools"] = "popmartXXL2c.consumerTools";
TbNetName["gameOver"] = "popmartXXL2c.gameOver";
......@@ -18168,6 +18169,12 @@ var StartPanelPrize = (function (_super) {
isGiftPrizeLevel: res.data.isGiftPrizeLevel
});
_this.hidePanel();
if (Tools_1.Tools.globalData.inviteId) {
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.doHelp, { inviteId: Tools_1.Tools.globalData.inviteId }, function (success, res) {
if (success)
Tools_1.Tools.globalData.inviteId = null;
}, true);
}
});
};
StartPanelPrize.prototype.initEvents = function () {
......@@ -18729,6 +18736,15 @@ var TaskPanel = (function (_super) {
if (!success)
return;
console.log(res);
for (var i = res.data.taskList.length - 1; i >= 0; i--) {
var v = res.data.taskList[i];
if ((v.taskType == TaskType.member || v.taskType == TaskType.follow)
&& v.todayCompleteTimes >= v.totalTimes
&& v.waitReceiveTimes <= 0) {
res.data.taskList.splice(i, 1);
}
}
console.log(res.data.taskList);
_this.scroll.updateData(res.data.taskList, true);
});
};
......@@ -18802,6 +18818,7 @@ var TaskItem = (function (_super) {
if (!success)
return;
ctrls_1.showToast("\u4EFB\u52A1\u5B8C\u6210\uFF0C\u4F53\u529B\u503C+" + res.data.power + "\uFF01");
Main_1.GDispatcher.dispatchEvent(G_EVENT_1.G_EVENT.UPDATE_TASK);
});
};
TaskItem.prototype.clickTask = function () {
......@@ -18821,7 +18838,7 @@ var TaskItem = (function (_super) {
});
break;
case TaskType.invites:
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.showSharePanel);
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.showSharePanel, { openId: Tools_1.Tools.globalData.openId });
break;
case TaskType.orderGoods:
console.log('去下单页');
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -85,8 +85,7 @@ export class Main {
// if (document.getElementById("__loading__")) document.getElementById("__loading__").style.display = "none";
//打开开始场景
changeScene(LoadingScene);
// changeScene(PlayScene, {chapter: 120});
// changeScene(PlayScene, {chapter: 120})
}
//在小程序显示时调用onShow
......
......@@ -10508,5 +10508,5 @@ export const ResJson = {
}
}
],
"path": "https://yun.duiba.com.cn/db_games/activity/babycare_xiaoxiao/1602039378/resource/"
"path": "https://yun.duiba.com.cn/db_games/activity/babycare_xiaoxiao/1602212094/resource/"
}
\ No newline at end of file
......@@ -15,6 +15,9 @@ export enum TbNetName {
drawLotteryPrize = 'popmartXXL2c.drawLotteryPrize',
// inviteId
doHelp = 'popmartXXL2c.doHelp',
/**
* 活动基本信息
* @param activityId
......
......@@ -28,8 +28,8 @@ export class StartPanelPrize extends Panel {
this.isShowing = true;
this.anchor.set(375, 812);
Tween.get(this)
.set({scaleX: 0, scaleY: 0})
.to({scaleX: 1, scaleY: 1}, 400, Ease.backOut)
.set({ scaleX: 0, scaleY: 0 })
.to({ scaleX: 1, scaleY: 1 }, 400, Ease.backOut)
.call(() => {
this.isShowing = false;
});
......@@ -44,7 +44,7 @@ export class StartPanelPrize extends Panel {
initUi() {
const {level} = this.data;
const { level } = this.data;
this.checkTex.textWidth = 750;
this.checkTex.textAlign = TEXT_ALIGN.CENTER;
......@@ -75,7 +75,7 @@ export class StartPanelPrize extends Panel {
}
private startGame() {
const {level, isPlayed} = this.data;
const { level, isPlayed } = this.data;
this.enableMouseEvt(false);
if (!isPlayed && Tools.propInfo.power <= 0) {// 体力不足
this.enableMouseEvt(true);
......@@ -83,7 +83,7 @@ export class StartPanelPrize extends Panel {
this.hidePanel();
return;
}
sendTbNet(TbNetName.dojoin, {level: level},
sendTbNet(TbNetName.dojoin, { level: level },
(success, res) => {
this.enableMouseEvt(true);
if (!success) return;
......@@ -94,6 +94,15 @@ export class StartPanelPrize extends Panel {
isGiftPrizeLevel: res.data.isGiftPrizeLevel
});
this.hidePanel();
// 如果有邀请人就去助力
if (Tools.globalData.inviteId) {
sendTbNet(TbNetName.doHelp, { inviteId: Tools.globalData.inviteId },
(success, res) => {
if(success)Tools.globalData.inviteId = null;
}, true
);
}
}
);
}
......@@ -161,7 +170,7 @@ export class StartTargetItem extends Container {
// 变大的动效
public playEffect() {
Tween.get(this)
.set({scaleX: 0, scaleY: 0})
.to({scaleX: 1, scaleY: 1}, 500, Ease.backOut)
.set({ scaleX: 0, scaleY: 0 })
.to({ scaleX: 1, scaleY: 1 }, 500, Ease.backOut)
}
}
......@@ -96,7 +96,7 @@ export class TaskPanel extends Panel {
this.isShowing = true;
this.y = layers.stageHeight + this.height;
Tween.get(this)
.to({y: 0}, 500, Ease.quartOut)
.to({ y: 0 }, 500, Ease.quartOut)
.call(() => {
this.isShowing = false;
});
......@@ -125,6 +125,17 @@ export class TaskPanel extends Panel {
if (!success) return;
console.log(res);
for (let i = res.data.taskList.length - 1; i >= 0; i--) {
const v = res.data.taskList[i];
if ((v.taskType == TaskType.member || v.taskType == TaskType.follow)
&& v.todayCompleteTimes >= v.totalTimes
&& v.waitReceiveTimes <= 0) {
res.data.taskList.splice(i, 1);
}
}
console.log(res.data.taskList);
// this.scroll.view.children.length = 0;
this.scroll.updateData(res.data.taskList, true);
}
......@@ -234,11 +245,12 @@ class TaskItem extends Item {
private clickGet() {
this.getBtn.mouseEnable = false;
sendTbNet(TbNetName.receiveTaskRewards, {taskType: this.data.taskType},
sendTbNet(TbNetName.receiveTaskRewards, { taskType: this.data.taskType },
(success, res) => {
this.getBtn.mouseEnable = true;
if (!success) return;
showToast(`任务完成,体力值+${res.data.power}!`);
GDispatcher.dispatchEvent(G_EVENT.UPDATE_TASK);
}
);
}
......@@ -246,7 +258,7 @@ class TaskItem extends Item {
private clickTask() {
switch (this.data.taskType) {
case TaskType.member:
sendTbNet(TbNetName.navigateToOutside, {url: this.data.beMemberUrl});
sendTbNet(TbNetName.navigateToOutside, { url: this.data.beMemberUrl });
break;
case TaskType.browserGoods:
/// TODO 去浏览页
......@@ -256,14 +268,14 @@ class TaskItem extends Item {
sendTbNet(TbNetName.favorShop, {},
(fs, fr) => {
if (!fs) return;
sendTbNet(TbNetName.completeTask, {taskType: this.data.taskType},
sendTbNet(TbNetName.completeTask, { taskType: this.data.taskType },
(cs, cr) => GDispatcher.dispatchEvent(G_EVENT.UPDATE_TASK)
);
}
);
break;
case TaskType.invites:
sendTbNet(TbNetName.showSharePanel);
sendTbNet(TbNetName.showSharePanel, { openId: Tools.globalData.openId });
break;
case TaskType.orderGoods:
/// TODO 去下单页
......
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