Skip to content

B
babycare_xiaoxiao
Commit 1adf6cb2 authored by 邱旭's avatar 邱旭
Browse files
Options

m

parent 0ee5a54d
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 15 deletions
.idea/workspace.xml
View file @ 1adf6cb2
...@@ -3,6 +3,9 @@ ...@@ -3,6 +3,9 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="0d3cb18d-e144-41a0-bc8b-4877c2e1fef1" name="默认的" comment=""> <list default="true" id="0d3cb18d-e144-41a0-bc8b-4877c2e1fef1" name="默认的" comment="">
<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.map" beforeDir="false" afterPath="$PROJECT_DIR$/output.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/FreePowerPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/FreePowerPanel.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/scene/map/MapScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapScene.ts" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -132,14 +135,7 @@ ...@@ -132,14 +135,7 @@
<workItem from="1613698993022" duration="22309000" /> <workItem from="1613698993022" duration="22309000" />
<workItem from="1613785579125" duration="17751000" /> <workItem from="1613785579125" duration="17751000" />
<workItem from="1613958457445" duration="19850000" /> <workItem from="1613958457445" duration="19850000" />
<workItem from="1614131869846" duration="61000" /> <workItem from="1614131869846" duration="1111000" />
</task>
<task id="LOCAL-00003" summary="首页引导">
<created>1612597435229</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1612597435229</updated>
</task> </task>
<task id="LOCAL-00004" summary="Rule"> <task id="LOCAL-00004" summary="Rule">
<created>1612598313143</created> <created>1612598313143</created>
...@@ -477,7 +473,14 @@ ...@@ -477,7 +473,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1614083501689</updated> <updated>1614083501689</updated>
</task> </task>
<option name="localTasksCounter" value="52" /> <task id="LOCAL-00052" summary="m">
<created>1614131940838</created>
<option name="number" value="00052" />
<option name="presentableId" value="LOCAL-00052" />
<option name="project" value="LOCAL" />
<updated>1614131940838</updated>
</task>
<option name="localTasksCounter" value="53" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
......
output.js
View file @ 1adf6cb2
...@@ -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.isNewUser && Tools_1.Tools.globalData.isFirstLogin) { if (!Tools_1.Tools.globalData.isNewUser && Tools_1.Tools.globalData.loginAddPower > 0) {
ctrls_1.showPanel(FreePowerPanel_1.FreePowerPanel); ctrls_1.showPanel(FreePowerPanel_1.FreePowerPanel);
} }
Tools_1.Tools.globalData.isFirstLogin = false; Tools_1.Tools.globalData.loginAddPower = 0;
if (Tools_1.Tools.globalData.inviteId) { if (Tools_1.Tools.globalData.inviteId) {
ctrls_1.showPanel(HelpPanel_1.HelpPanel); ctrls_1.showPanel(HelpPanel_1.HelpPanel);
} }
output.js.map
View file @ 1adf6cb2
This source diff could not be displayed because it is too large. You can view the blob instead.
src/panels/FreePowerPanel.ts
View file @ 1adf6cb2
...@@ -21,7 +21,7 @@ export class FreePowerPanel extends Panel { ...@@ -21,7 +21,7 @@ export class FreePowerPanel extends Panel {
this.addChild(Tools.getSprite('powerIcon.png')).position.set(280, 763); this.addChild(Tools.getSprite('powerIcon.png')).position.set(280, 763);
const powerTxt = this.addChild(Tools.getText( const powerTxt = this.addChild(Tools.getText(
`+${Tools.globalData.loginAddPower}`, 38, "#ffe090", `+${this.data.loginAddPower}`, 38, "#ffe090",
TEXT_ALIGN.LEFT, TEXT_ALIGN.LEFT,
)); ));
powerTxt.strokeColor = '#7f3c05'; powerTxt.strokeColor = '#7f3c05';
......
src/scene/map/MapScene.ts
View file @ 1adf6cb2
...@@ -47,11 +47,14 @@ export class MapScene extends Scene { ...@@ -47,11 +47,14 @@ export class MapScene extends Scene {
this.initMap(); this.initMap();
this.updateMapCheck(); this.updateMapCheck();
if (!Tools.globalData.isNewUser && Tools.globalData.loginAddPower > 0) { // 不是新用户且第一次登陆 if (!Tools.globalData.isNewUser && Tools.globalData.loginAddPower > 0) { // 不是新用户且加体力
showPanel(FreePowerPanel); showPanel(FreePowerPanel, {
loginAddPower: Tools.globalData.loginAddPower
});
} }
Tools.globalData.loginAddPower = 0; Tools.globalData.loginAddPower = 0;
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