Commit 00758d77 authored by 邱旭's avatar 邱旭

m

parent 2ada8061
...@@ -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/scene/map/MapScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/HelpPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/HelpPanel.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" />
...@@ -134,7 +133,7 @@ ...@@ -134,7 +133,7 @@
<workItem from="1612662929222" duration="40609000" /> <workItem from="1612662929222" duration="40609000" />
<workItem from="1613698993022" duration="22309000" /> <workItem from="1613698993022" duration="22309000" />
<workItem from="1613785579125" duration="17751000" /> <workItem from="1613785579125" duration="17751000" />
<workItem from="1613958457445" duration="18038000" /> <workItem from="1613958457445" duration="18553000" />
</task> </task>
<task id="LOCAL-00001" summary="斐乐消消乐"> <task id="LOCAL-00001" summary="斐乐消消乐">
<created>1612581213298</created> <created>1612581213298</created>
...@@ -472,7 +471,14 @@ ...@@ -472,7 +471,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1614074400505</updated> <updated>1614074400505</updated>
</task> </task>
<option name="localTasksCounter" value="49" /> <task id="LOCAL-00049" summary="m">
<created>1614081398797</created>
<option name="number" value="00049" />
<option name="presentableId" value="LOCAL-00049" />
<option name="project" value="LOCAL" />
<updated>1614081398797</updated>
</task>
<option name="localTasksCounter" value="50" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
......
...@@ -7864,7 +7864,7 @@ var TbNetName; ...@@ -7864,7 +7864,7 @@ var TbNetName;
TbNetName["receiveEnamePrize"] = "feile.receiveEnamePrize"; TbNetName["receiveEnamePrize"] = "feile.receiveEnamePrize";
TbNetName["getRemainTimes"] = "feile.getRemainTimes"; TbNetName["getRemainTimes"] = "feile.getRemainTimes";
TbNetName["doHelp"] = "feile.doHelp"; TbNetName["doHelp"] = "feile.doHelp";
TbNetName["queryVipInfo"] = "feile.queryVipInfo"; TbNetName["getVipInfo"] = "feile.getVipInfo";
TbNetName["getActivityBaseInfoById"] = "feile.getActivityBaseInfoById"; TbNetName["getActivityBaseInfoById"] = "feile.getActivityBaseInfoById";
TbNetName["updateActivityInfo"] = "mine.updateActivityInfo"; TbNetName["updateActivityInfo"] = "mine.updateActivityInfo";
TbNetName["openMember"] = "mine.openMember"; TbNetName["openMember"] = "mine.openMember";
...@@ -11362,7 +11362,7 @@ var HelpPanel = (function (_super) { ...@@ -11362,7 +11362,7 @@ var HelpPanel = (function (_super) {
var _a, success, data; var _a, success, data;
return __generator(this, function (_b) { return __generator(this, function (_b) {
switch (_b.label) { switch (_b.label) {
case 0: return [4, TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.queryVipInfo)]; case 0: return [4, TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.getVipInfo)];
case 1: case 1:
_a = _b.sent(), success = _a.success, data = _a.data; _a = _b.sent(), success = _a.success, data = _a.data;
return [2, success && data.isvip]; return [2, success && data.isvip];
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -47,10 +47,10 @@ export class MapScene extends Scene { ...@@ -47,10 +47,10 @@ export class MapScene extends Scene {
this.initMap(); this.initMap();
this.updateMapCheck(); this.updateMapCheck();
if(Tools.globalData.isFirstLogin){ if (!Tools.globalData.isNewUser && Tools.globalData.isFirstLogin) { // 不是新用户且第一次登陆
showPanel(FreePowerPanel); showPanel(FreePowerPanel);
Tools.globalData.isFirstLogin = false;
} }
Tools.globalData.isFirstLogin = false;
if (Tools.globalData.inviteId) { // 有邀请码,唤起弹窗 if (Tools.globalData.inviteId) { // 有邀请码,唤起弹窗
showPanel(HelpPanel); showPanel(HelpPanel);
......
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