Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
B
babycare_xiaoxiao
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
翁阳
babycare_xiaoxiao
Commits
1adf6cb2
Commit
1adf6cb2
authored
Feb 24, 2021
by
邱旭
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
m
parent
0ee5a54d
Changes
5
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
15 deletions
+21
-15
workspace.xml
.idea/workspace.xml
+12
-9
output.js
output.js
+2
-2
output.js.map
output.js.map
+1
-1
FreePowerPanel.ts
src/panels/FreePowerPanel.ts
+1
-1
MapScene.ts
src/scene/map/MapScene.ts
+5
-2
No files found.
.idea/workspace.xml
View file @
1adf6cb2
...
...
@@ -3,6 +3,9 @@
<component
name=
"ChangeListManager"
>
<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$/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"
/>
</list>
<option
name=
"SHOW_DIALOG"
value=
"false"
/>
...
...
@@ -132,14 +135,7 @@
<workItem
from=
"1613698993022"
duration=
"22309000"
/>
<workItem
from=
"1613785579125"
duration=
"17751000"
/>
<workItem
from=
"1613958457445"
duration=
"19850000"
/>
<workItem
from=
"1614131869846"
duration=
"61000"
/>
</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>
<workItem
from=
"1614131869846"
duration=
"1111000"
/>
</task>
<task
id=
"LOCAL-00004"
summary=
"Rule"
>
<created>
1612598313143
</created>
...
...
@@ -477,7 +473,14 @@
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1614083501689
</updated>
</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
/>
</component>
<component
name=
"TypeScriptGeneratedFilesManager"
>
...
...
output.js
View file @
1adf6cb2
...
...
@@ -15548,10 +15548,10 @@ var MapScene = (function (_super) {
this.mapContainer = this.scrollPage.view.addChild(new Container());
this.initMap();
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);
}
Tools_1.Tools.globalData.
isFirstLogin = false
;
Tools_1.Tools.globalData.
loginAddPower = 0
;
if (Tools_1.Tools.globalData.inviteId) {
ctrls_1.showPanel(HelpPanel_1.HelpPanel);
}
output.js.map
View file @
1adf6cb2
This diff is collapsed.
Click to expand it.
src/panels/FreePowerPanel.ts
View file @
1adf6cb2
...
...
@@ -21,7 +21,7 @@ export class FreePowerPanel extends Panel {
this
.
addChild
(
Tools
.
getSprite
(
'powerIcon.png'
)).
position
.
set
(
280
,
763
);
const
powerTxt
=
this
.
addChild
(
Tools
.
getText
(
`+
${
Tools
.
globalD
ata
.
loginAddPower
}
`
,
38
,
"#ffe090"
,
`+
${
this
.
d
ata
.
loginAddPower
}
`
,
38
,
"#ffe090"
,
TEXT_ALIGN
.
LEFT
,
));
powerTxt
.
strokeColor
=
'#7f3c05'
;
...
...
src/scene/map/MapScene.ts
View file @
1adf6cb2
...
...
@@ -47,11 +47,14 @@ export class MapScene extends Scene {
this
.
initMap
();
this
.
updateMapCheck
();
if
(
!
Tools
.
globalData
.
isNewUser
&&
Tools
.
globalData
.
loginAddPower
>
0
)
{
// 不是新用户且第一次登陆
showPanel
(
FreePowerPanel
);
if
(
!
Tools
.
globalData
.
isNewUser
&&
Tools
.
globalData
.
loginAddPower
>
0
)
{
// 不是新用户且加体力
showPanel
(
FreePowerPanel
,
{
loginAddPower
:
Tools
.
globalData
.
loginAddPower
});
}
Tools
.
globalData
.
loginAddPower
=
0
;
if
(
Tools
.
globalData
.
inviteId
)
{
// 有邀请码,唤起弹窗
showPanel
(
HelpPanel
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment