Skip to content

B
babycare_xiaoxiao
Commit 4a6e8ddb authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

1

parent 1ffc773b
Show whitespace changes
Inline Side-by-side
Showing with 84 additions and 63 deletions
.idea/workspace.xml
View file @ 4a6e8ddb
......@@ -5,13 +5,9 @@
<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$/resource/playScene/hairballPiece8-1.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/hairballPiece9.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/hairballPiece9.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/res.json" beforeDir="false" afterPath="$PROJECT_DIR$/resource/res.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ResJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ResJson.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Tools.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/Tools.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/hairballPiece9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/SuccessPrizePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/SuccessPrizePanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/TaskPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/TaskPanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapScene.ts" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -64,13 +60,6 @@
<property name="vue.rearranger.settings.migration" value="true" />
</component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/resource" />
<recent name="$PROJECT_DIR$" />
<recent name="$PROJECT_DIR$/resource/PrizePanel" />
<recent name="$PROJECT_DIR$/resource/common" />
<recent name="$PROJECT_DIR$/resource/SuccessPanel" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/src" />
<recent name="$PROJECT_DIR$/l" />
......@@ -78,8 +67,15 @@
<recent name="$PROJECT_DIR$/scripts" />
<recent name="$PROJECT_DIR$/src/panels" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/resource" />
<recent name="$PROJECT_DIR$" />
<recent name="$PROJECT_DIR$/resource/PrizePanel" />
<recent name="$PROJECT_DIR$/resource/common" />
<recent name="$PROJECT_DIR$/resource/SuccessPanel" />
</key>
</component>
<component name="RunManager" selected="npm.dev">
<component name="RunManager" selected="npm.buildTS">
<configuration name="aaa.html" type="JavascriptDebugType" temporary="true" nameIsGenerated="true" uri="http://localhost:63342/ppmt_xxl/aaa.html" useBuiltInWebServerPort="true">
<method v="2" />
</configuration>
......@@ -126,8 +122,8 @@
</configuration>
<recent_temporary>
<list>
<item itemvalue="npm.dev" />
<item itemvalue="npm.buildTS" />
<item itemvalue="npm.dev" />
<item itemvalue="npm.build" />
<item itemvalue="npm.flushRes" />
<item itemvalue="JavaScript Debug.aaa.html" />
......@@ -202,14 +198,7 @@
<workItem from="1602322734643" duration="2339000" />
<workItem from="1602380089772" duration="7488000" />
<workItem from="1602467369737" duration="13722000" />
<workItem from="1602553054726" duration="3083000" />
</task>
<task id="LOCAL-00037" summary="aaa">
<created>1595921347633</created>
<option name="number" value="00037" />
<option name="presentableId" value="LOCAL-00037" />
<option name="project" value="LOCAL" />
<updated>1595921347633</updated>
<workItem from="1602553054726" duration="6354000" />
</task>
<task id="LOCAL-00038" summary="1111">
<created>1595928130989</created>
......@@ -547,7 +536,14 @@
<option name="project" value="LOCAL" />
<updated>1602505729315</updated>
</task>
<option name="localTasksCounter" value="86" />
<task id="LOCAL-00086" summary="1">
<created>1602563242920</created>
<option name="number" value="00086" />
<option name="presentableId" value="LOCAL-00086" />
<option name="project" value="LOCAL" />
<updated>1602563242920</updated>
</task>
<option name="localTasksCounter" value="87" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -614,51 +610,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="560" y="183" width="783" height="664" key="CommitChangelistDialog2" timestamp="1602505728762">
<state x="560" y="183" width="783" height="664" key="CommitChangelistDialog2" timestamp="1602563242199">
<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="560" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1602505728762" />
<state x="560" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1602563242199" />
<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="63" width="1683" height="1037" key="DiffContextDialog" timestamp="1602321352721">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="131" y="63" width="1683" height="1037" key="DiffContextDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1602321352721" />
<state width="902" height="321" key="GridCell.Tab.0.bottom" timestamp="1602561774408">
<state width="902" height="321" key="GridCell.Tab.0.bottom" timestamp="1602571095676">
<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="902" height="321" key="GridCell.Tab.0.bottom/30.23.1410.877@30.23.1410.877" timestamp="1602513888913" />
<state width="888" height="321" key="GridCell.Tab.0.bottom/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" />
<state width="902" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1602561774408" />
<state width="902" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1602571095676" />
<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="902" height="321" key="GridCell.Tab.0.center" timestamp="1602561774406">
<state width="902" height="321" key="GridCell.Tab.0.center" timestamp="1602571095675">
<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="902" height="321" key="GridCell.Tab.0.center/30.23.1410.877@30.23.1410.877" timestamp="1602513888912" />
<state width="888" height="321" key="GridCell.Tab.0.center/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" />
<state width="902" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1602561774406" />
<state width="902" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1602571095675" />
<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="902" height="321" key="GridCell.Tab.0.left" timestamp="1602561774405">
<state width="902" height="321" key="GridCell.Tab.0.left" timestamp="1602571095674">
<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="902" height="321" key="GridCell.Tab.0.left/30.23.1410.877@30.23.1410.877" timestamp="1602513888911" />
<state width="888" height="321" key="GridCell.Tab.0.left/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" />
<state width="902" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1602561774405" />
<state width="902" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1602571095674" />
<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="902" height="321" key="GridCell.Tab.0.right" timestamp="1602561774407">
<state width="902" height="321" key="GridCell.Tab.0.right" timestamp="1602571095675">
<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="902" height="321" key="GridCell.Tab.0.right/30.23.1410.877@30.23.1410.877" timestamp="1602513888913" />
<state width="888" height="321" key="GridCell.Tab.0.right/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" />
<state width="902" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1602561774407" />
<state width="902" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1602571095675" />
<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">
......@@ -675,12 +671,12 @@
</state>
<state x="762" y="247" key="SettingsEditor/30.23.1890.1177@30.23.1890.1177" timestamp="1602321211804" />
<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="1602505730351">
<state x="91" y="351" key="Vcs.Push.Dialog.v2" timestamp="1602563244234">
<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="1602505730351" />
<state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1602563244234" />
<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" />
......@@ -713,11 +709,11 @@
</state>
<state x="156" y="286" key="run.anything.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1596432664001" />
<state x="157" y="286" key="run.anything.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595475548860" />
<state x="639" y="288" width="670" height="429" key="search.everywhere.popup" timestamp="1602561792687">
<state x="639" y="288" width="670" height="429" key="search.everywhere.popup" timestamp="1602570887569">
<screen x="30" y="23" width="1890" height="1177" />
</state>
<state x="484" y="220" width="670" height="504" key="search.everywhere.popup/30.23.1410.877@30.23.1410.877" timestamp="1600829323295" />
<state x="639" y="288" width="670" height="429" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1602561792687" />
<state x="639" y="288" width="670" height="429" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1602570887569" />
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595584259535" />
<state x="249" y="530" key="vcs.readOnlyHandler.ReadOnlyStatusDialog" timestamp="1602310103215">
<screen x="30" y="23" width="1890" height="1177" />
......
output.js
View file @ 4a6e8ddb
......@@ -13554,13 +13554,23 @@ var Tools = (function () {
Tools.propInfo.hammers = data.tools.hammers || 0;
}
Tools.propInfo.power = data.power || 0;
if (my && my.getServerTime) {
my.getServerTime({
success: function (t) {
Tools.actEnd = (+res.data.endTime <= +t.time);
Tools.actStart = (+t.time >= +res.data.startTime);
},
failed: function () {
Tools.actEnd = (+res.data.endTime <= Date.now());
Tools.actStart = (Date.now() >= +res.data.startTime);
}
});
}
else {
Tools.actEnd = (+res.data.endTime <= Date.now());
Tools.actStart = (Date.now() >= +res.data.startTime);
}
}
r(s);
});
});
......@@ -20965,7 +20975,6 @@ var MapScene_1 = __webpack_require__(/*! ../scene/map/MapScene */ "./src/scene/m
var MouseEvent = FYGE.MouseEvent;
var Button = FYGE.Button;
var Texture = FYGE.Texture;
var TaoBaoNet_1 = __webpack_require__(/*! ../TaoBaoNet */ "./src/TaoBaoNet.ts");
var propImg = (_a = {},
_a[PropType_1.PropType.BOOMS] = 'boomBtn.png',
_a[PropType_1.PropType.HAMMERS] = 'hammerBtn.png',
......@@ -21055,9 +21064,7 @@ var SuccessPrizePanel = (function (_super) {
_super.prototype.start.call(this);
};
SuccessPrizePanel.prototype.lookPrize = function () {
ctrls_1.changeScene(MapScene_1.MapScene);
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.navigateTo, { url: '/pages/myprize/myprize' }, function () {
}, true);
ctrls_1.changeScene(MapScene_1.MapScene, { doSomething: 'toMyPrize' });
_super.prototype.hidePanel.call(this);
};
SuccessPrizePanel.prototype.again = function () {
......@@ -21187,13 +21194,13 @@ var TaskPanel = (function (_super) {
this.isShowing = true;
this.y = layers_1.layers.stageHeight + this.height;
Tween.get(this)
.to({ y: 0 }, 500, Ease.quartOut)
.to({ y: 80 - layers_1.layers.stageOffsetY }, 500, Ease.quartOut)
.call(function () {
_this.isShowing = false;
});
};
TaskPanel.prototype.initUi = function () {
this.scroll = this.addChild(new ScrollList(TaskItem, 700, 180, 700, 808));
this.scroll = this.addChild(new ScrollList(TaskItem, 700, 180, 700, 878));
this.scroll.position.set(25, 670);
};
TaskPanel.prototype.start = function (data) {
......@@ -24464,6 +24471,12 @@ var MapScene = (function (_super) {
ctrls_1.showPanel(FreePowerPanel_1.FreePowerPanel);
Tools_1.Tools.globalData.loginAddPower = false;
}
if (this.data && this.data.doSomething && this.data.doSomething == 'toMyPrize') {
setTimeout(function () {
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.navigateTo, { url: '/pages/myprize/myprize' }, function () {
}, true);
}, 100);
}
};
MapScene.prototype.updateMapCheck = function () {
var _this = this;
output.js.map
View file @ 4a6e8ddb
This source diff could not be displayed because it is too large. You can view the blob instead.
src/panels/SuccessPrizePanel.ts
View file @ 4a6e8ddb
......@@ -110,14 +110,14 @@ export class SuccessPrizePanel extends Panel {
* 查看奖品
*/
private lookPrize() {
changeScene(MapScene);
sendTbNet(
TbNetName.navigateTo,
{ url: '/pages/myprize/myprize' },
() => {
},
true
);
changeScene(MapScene, {doSomething:'toMyPrize'});
// sendTbNet(
// TbNetName.navigateTo,
// { url: '/pages/myprize/myprize' },
// () => {
// },
// true
// );
super.hidePanel();
}
......
src/scene/map/MapScene.ts
View file @ 4a6e8ddb
......@@ -56,6 +56,18 @@ export class MapScene extends Scene {
Tools.globalData.loginAddPower = false;
}
if (this.data && this.data.doSomething && this.data.doSomething == 'toMyPrize') {
setTimeout(() => {
sendTbNet(
TbNetName.navigateTo,
{url: '/pages/myprize/myprize'},
() => {
},
true
);
}, 100);
}
}
private updateMapCheck() {
......@@ -93,7 +105,7 @@ export class MapScene extends Scene {
mapGuide.mouseEnable = false;
const guide_check = guide.addChild(new CheckBtn({ check: 1 }));
const guide_check = guide.addChild(new CheckBtn({check: 1}));
guide_check.enabled = true;
guide_check.type = CHECK_TYPE.CUR;
guide_check.position.set(MapScene.checkArr[1].x, MapScene.checkArr[1].y + 140 * layers.stageOffsetY / 812);
......@@ -120,7 +132,7 @@ export class MapScene extends Scene {
guide.alpha = 0;
Tween.get(guide)
.to({ alpha: 1 }, 600, Ease.quadInOut);
.to({alpha: 1}, 600, Ease.quadInOut);
// Tween.get(guide_fox)
// .wait(300)
......@@ -178,7 +190,7 @@ export class MapScene extends Scene {
const arr = new Array(120);
for (let i = 0; i < 120; i++) {
arr[i] = { check: i + 1 };
arr[i] = {check: i + 1};
}
arr.reverse();
......@@ -243,7 +255,7 @@ export class MapScene extends Scene {
// 如果有邀请人就去助力
if (Tools.globalData.inviteId) {
sendTbNet(TbNetName.doHelp, { inviteId: Tools.globalData.inviteId },
sendTbNet(TbNetName.doHelp, {inviteId: Tools.globalData.inviteId},
(success, res) => {
Tools.globalData.inviteId = null;
if (success) showToast('助力成功');
......
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