Commit cf38f12d authored by 邱旭's avatar 邱旭

m

parent 00758d77
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
<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/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" />
<change beforePath="$PROJECT_DIR$/src/panels/StartPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/StartPanel.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" />
...@@ -133,14 +134,7 @@ ...@@ -133,14 +134,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="18553000" /> <workItem from="1613958457445" duration="18967000" />
</task>
<task id="LOCAL-00001" summary="斐乐消消乐">
<created>1612581213298</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1612581213298</updated>
</task> </task>
<task id="LOCAL-00002" summary="gameGuide"> <task id="LOCAL-00002" summary="gameGuide">
<created>1612593007211</created> <created>1612593007211</created>
...@@ -478,7 +472,14 @@ ...@@ -478,7 +472,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1614081398797</updated> <updated>1614081398797</updated>
</task> </task>
<option name="localTasksCounter" value="50" /> <task id="LOCAL-00050" summary="m">
<created>1614082080974</created>
<option name="number" value="00050" />
<option name="presentableId" value="LOCAL-00050" />
<option name="project" value="LOCAL" />
<updated>1614082080977</updated>
</task>
<option name="localTasksCounter" value="51" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
......
...@@ -11365,7 +11365,7 @@ var HelpPanel = (function (_super) { ...@@ -11365,7 +11365,7 @@ var HelpPanel = (function (_super) {
case 0: return [4, TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.getVipInfo)]; 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];
} }
}); });
}); });
...@@ -12106,7 +12106,7 @@ var StartPanel = (function (_super) { ...@@ -12106,7 +12106,7 @@ var StartPanel = (function (_super) {
return __generator(this, function (_a) { return __generator(this, function (_a) {
this.enableMouseEvt(true); this.enableMouseEvt(true);
if (!success) { if (!success) {
if (res.data && !res.data.isvip) { if (res.data && !res.data.isVip) {
ctrls_1.showToast('请入会后参与'); ctrls_1.showToast('请入会后参与');
setTimeout(function () { setTimeout(function () {
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.openMember); TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.openMember);
...@@ -15548,10 +15548,10 @@ var MapScene = (function (_super) { ...@@ -15548,10 +15548,10 @@ var MapScene = (function (_super) {
this.mapContainer = this.scrollPage.view.addChild(new Container()); this.mapContainer = this.scrollPage.view.addChild(new Container());
this.initMap(); this.initMap();
this.updateMapCheck(); this.updateMapCheck();
if (Tools_1.Tools.globalData.isFirstLogin) { if (!Tools_1.Tools.globalData.isNewUser && Tools_1.Tools.globalData.isFirstLogin) {
ctrls_1.showPanel(FreePowerPanel_1.FreePowerPanel); ctrls_1.showPanel(FreePowerPanel_1.FreePowerPanel);
Tools_1.Tools.globalData.isFirstLogin = false;
} }
Tools_1.Tools.globalData.isFirstLogin = false;
if (Tools_1.Tools.globalData.inviteId) { if (Tools_1.Tools.globalData.inviteId) {
ctrls_1.showPanel(HelpPanel_1.HelpPanel); ctrls_1.showPanel(HelpPanel_1.HelpPanel);
} }
This diff is collapsed.
...@@ -69,7 +69,7 @@ export class HelpPanel extends Panel { ...@@ -69,7 +69,7 @@ export class HelpPanel extends Panel {
async queryVip() { async queryVip() {
const { success, data } = await sendTbNet(TbNetName.getVipInfo); const { success, data } = await sendTbNet(TbNetName.getVipInfo);
return success && data.isvip; return success && data.isVip;
} }
initEvents() { initEvents() {
......
...@@ -99,7 +99,7 @@ export class StartPanel extends Panel { ...@@ -99,7 +99,7 @@ export class StartPanel extends Panel {
async (success, res) => { async (success, res) => {
this.enableMouseEvt(true); this.enableMouseEvt(true);
if (!success) { if (!success) {
if (res.data && !res.data.isvip) { if (res.data && !res.data.isVip) {
showToast('请入会后参与'); showToast('请入会后参与');
setTimeout(() => { setTimeout(() => {
sendTbNet(TbNetName.openMember); sendTbNet(TbNetName.openMember);
......
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