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
72412a0d
Commit
72412a0d
authored
Jul 28, 2020
by
haiyoucuv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1111
parent
a9705ebc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
9 deletions
+22
-9
workspace.xml
.idea/workspace.xml
+14
-9
MapUI.ts
src/scene/map/MapUI.ts
+8
-0
No files found.
.idea/workspace.xml
View file @
72412a0d
...
@@ -3,9 +3,7 @@
...
@@ -3,9 +3,7 @@
<component
name=
"ChangeListManager"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"9cef0552-af3c-4a1c-be1f-dc41ebe5b6db"
name=
"Default Changelist"
comment=
""
>
<list
default=
"true"
id=
"9cef0552-af3c-4a1c-be1f-dc41ebe5b6db"
name=
"Default Changelist"
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$/mock/miniTb/babycare.gameOver.json"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/mock/miniTb/babycare.gameOver.json"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/scene/map/MapUI.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/scene/map/MapUI.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/panels/SuccessNoPrizePanel.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/panels/SuccessNoPrizePanel.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/panels/SuccessPrizePanel.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/panels/SuccessPrizePanel.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"
/>
...
@@ -120,7 +118,7 @@
...
@@ -120,7 +118,7 @@
<workItem
from=
"1595555429502"
duration=
"13854000"
/>
<workItem
from=
"1595555429502"
duration=
"13854000"
/>
<workItem
from=
"1595815330125"
duration=
"170000"
/>
<workItem
from=
"1595815330125"
duration=
"170000"
/>
<workItem
from=
"1595815541868"
duration=
"600000"
/>
<workItem
from=
"1595815541868"
duration=
"600000"
/>
<workItem
from=
"1595820295687"
duration=
"1
6855
000"
/>
<workItem
from=
"1595820295687"
duration=
"1
8709
000"
/>
</task>
</task>
<task
id=
"LOCAL-00001"
summary=
"111"
>
<task
id=
"LOCAL-00001"
summary=
"111"
>
<created>
1594122339119
</created>
<created>
1594122339119
</created>
...
@@ -374,7 +372,14 @@
...
@@ -374,7 +372,14 @@
<option
name=
"project"
value=
"LOCAL"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1595916428550
</updated>
<updated>
1595916428550
</updated>
</task>
</task>
<option
name=
"localTasksCounter"
value=
"37"
/>
<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>
</task>
<option
name=
"localTasksCounter"
value=
"38"
/>
<servers
/>
<servers
/>
</component>
</component>
<component
name=
"TypeScriptGeneratedFilesManager"
>
<component
name=
"TypeScriptGeneratedFilesManager"
>
...
@@ -401,10 +406,10 @@
...
@@ -401,10 +406,10 @@
<screen
x=
"31"
y=
"23"
width=
"1889"
height=
"1177"
/>
<screen
x=
"31"
y=
"23"
width=
"1889"
height=
"1177"
/>
</state>
</state>
<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=
"251"
y=
"471"
key=
"ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/31.23.1889.1177@31.23.1889.1177"
timestamp=
"1594113080922"
/>
<state
x=
"557"
y=
"183"
width=
"884"
height=
"891"
key=
"CommitChangelistDialog2"
timestamp=
"15959
16428352
"
>
<state
x=
"557"
y=
"183"
width=
"884"
height=
"891"
key=
"CommitChangelistDialog2"
timestamp=
"15959
21347433
"
>
<screen
x=
"30"
y=
"23"
width=
"1890"
height=
"1177"
/>
<screen
x=
"30"
y=
"23"
width=
"1890"
height=
"1177"
/>
</state>
</state>
<state
x=
"557"
y=
"183"
key=
"CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177"
timestamp=
"15959
16428352
"
/>
<state
x=
"557"
y=
"183"
key=
"CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177"
timestamp=
"15959
21347433
"
/>
<state
x=
"558"
y=
"183"
width=
"884"
height=
"891"
key=
"CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177"
timestamp=
"1595584297912"
/>
<state
x=
"558"
y=
"183"
width=
"884"
height=
"891"
key=
"CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177"
timestamp=
"1595584297912"
/>
<state
width=
"883"
height=
"321"
key=
"GridCell.Tab.0.bottom"
timestamp=
"1595903189158"
>
<state
width=
"883"
height=
"321"
key=
"GridCell.Tab.0.bottom"
timestamp=
"1595903189158"
>
<screen
x=
"30"
y=
"23"
width=
"1890"
height=
"1177"
/>
<screen
x=
"30"
y=
"23"
width=
"1890"
height=
"1177"
/>
...
@@ -442,10 +447,10 @@
...
@@ -442,10 +447,10 @@
<screen
x=
"31"
y=
"23"
width=
"1889"
height=
"1177"
/>
<screen
x=
"31"
y=
"23"
width=
"1889"
height=
"1177"
/>
</state>
</state>
<state
x=
"300"
y=
"248"
key=
"SettingsEditor/31.23.1889.1177@31.23.1889.1177"
timestamp=
"1594798992724"
/>
<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=
"15959
16430231
"
>
<state
x=
"91"
y=
"351"
key=
"Vcs.Push.Dialog.v2"
timestamp=
"15959
21348828
"
>
<screen
x=
"30"
y=
"23"
width=
"1890"
height=
"1177"
/>
<screen
x=
"30"
y=
"23"
width=
"1890"
height=
"1177"
/>
</state>
</state>
<state
x=
"91"
y=
"351"
key=
"Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177"
timestamp=
"15959
16430230
"
/>
<state
x=
"91"
y=
"351"
key=
"Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177"
timestamp=
"15959
21348828
"
/>
<state
x=
"92"
y=
"351"
key=
"Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177"
timestamp=
"1595584299423"
/>
<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"
>
<state
x=
"87"
y=
"216"
key=
"com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser"
timestamp=
"1594705166397"
>
<screen
x=
"31"
y=
"23"
width=
"1889"
height=
"1177"
/>
<screen
x=
"31"
y=
"23"
width=
"1889"
height=
"1177"
/>
...
...
src/scene/map/MapUI.ts
View file @
72412a0d
...
@@ -13,6 +13,8 @@ import { TaskPanel } from "../../panels/TaskPanel";
...
@@ -13,6 +13,8 @@ import { TaskPanel } from "../../panels/TaskPanel";
import
{
sendTbNet
,
TbNetName
}
from
"../../TaoBaoNet"
;
import
{
sendTbNet
,
TbNetName
}
from
"../../TaoBaoNet"
;
import
Texture
=
FYGE
.
Texture
;
import
Texture
=
FYGE
.
Texture
;
import
{
LotteryScene
}
from
"../LotteryScene"
;
import
{
LotteryScene
}
from
"../LotteryScene"
;
import
{
GDispatcher
}
from
"../../Main"
;
import
{
G_EVENT
}
from
"../../common/G_EVENT"
;
export
default
class
MapUI
extends
Container
{
export
default
class
MapUI
extends
Container
{
public
energyBox
:
EnergyBox
=
null
;
public
energyBox
:
EnergyBox
=
null
;
...
@@ -182,6 +184,7 @@ class CreditsBox extends Container {
...
@@ -182,6 +184,7 @@ class CreditsBox extends Container {
));
));
await
this
.
updateCredits
();
await
this
.
updateCredits
();
GDispatcher
.
addEventListener
(
G_EVENT
.
ON_SHOW
,
this
.
updateCredits
,
this
);
}
}
public
async
updateCredits
()
{
public
async
updateCredits
()
{
...
@@ -193,6 +196,11 @@ class CreditsBox extends Container {
...
@@ -193,6 +196,11 @@ class CreditsBox extends Container {
}
}
this
.
countLabel
.
text
=
jfLabel
;
this
.
countLabel
.
text
=
jfLabel
;
}
}
public
destroy
()
{
super
.
destroy
();
GDispatcher
.
removeEventListener
(
G_EVENT
.
ON_SHOW
,
this
.
updateCredits
,
this
);
}
}
}
/**
/**
...
...
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