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
e7930e53
Commit
e7930e53
authored
Jul 28, 2020
by
haiyoucuv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aaa
parent
616a83f6
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
10 deletions
+14
-10
workspace.xml
.idea/workspace.xml
+13
-9
SuccessPrizePanel.ts
src/panels/SuccessPrizePanel.ts
+1
-1
No files found.
.idea/workspace.xml
View file @
e7930e53
...
...
@@ -3,10 +3,7 @@
<component
name=
"ChangeListManager"
>
<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$/resource/res.json"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/resource/res.json"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/ResJson.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/ResJson.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/panels/SuccessPrizePanel.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/panels/SuccessPrizePanel.ts"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/scene/map/CheckBtn.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/scene/map/CheckBtn.ts"
afterDir=
"false"
/>
</list>
<option
name=
"SHOW_DIALOG"
value=
"false"
/>
<option
name=
"HIGHLIGHT_CONFLICTS"
value=
"true"
/>
...
...
@@ -121,7 +118,7 @@
<workItem
from=
"1595555429502"
duration=
"13854000"
/>
<workItem
from=
"1595815330125"
duration=
"170000"
/>
<workItem
from=
"1595815541868"
duration=
"600000"
/>
<workItem
from=
"1595820295687"
duration=
"1
0081
000"
/>
<workItem
from=
"1595820295687"
duration=
"1
3079
000"
/>
</task>
<task
id=
"LOCAL-00001"
summary=
"111"
>
<created>
1594122339119
</created>
...
...
@@ -361,7 +358,14 @@
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1595854773117
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"35"
/>
<task
id=
"LOCAL-00035"
summary=
"Success Panel Effect!"
>
<created>
1595906807870
</created>
<option
name=
"number"
value=
"00035"
/>
<option
name=
"presentableId"
value=
"LOCAL-00035"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1595906807870
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"36"
/>
<servers
/>
</component>
<component
name=
"TypeScriptGeneratedFilesManager"
>
...
...
@@ -387,10 +391,10 @@
<screen
x=
"31"
y=
"23"
width=
"1889"
height=
"1177"
/>
</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=
"557"
y=
"183"
width=
"884"
height=
"891"
key=
"CommitChangelistDialog2"
timestamp=
"1595
854772873
"
>
<state
x=
"557"
y=
"183"
width=
"884"
height=
"891"
key=
"CommitChangelistDialog2"
timestamp=
"1595
906807681
"
>
<screen
x=
"30"
y=
"23"
width=
"1890"
height=
"1177"
/>
</state>
<state
x=
"557"
y=
"183"
key=
"CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177"
timestamp=
"1595
854772873
"
/>
<state
x=
"557"
y=
"183"
key=
"CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177"
timestamp=
"1595
906807681
"
/>
<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"
>
<screen
x=
"30"
y=
"23"
width=
"1890"
height=
"1177"
/>
...
...
@@ -428,10 +432,10 @@
<screen
x=
"31"
y=
"23"
width=
"1889"
height=
"1177"
/>
</state>
<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=
"1595
854775050
"
>
<state
x=
"91"
y=
"351"
key=
"Vcs.Push.Dialog.v2"
timestamp=
"1595
906810375
"
>
<screen
x=
"30"
y=
"23"
width=
"1890"
height=
"1177"
/>
</state>
<state
x=
"91"
y=
"351"
key=
"Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177"
timestamp=
"1595
854775050
"
/>
<state
x=
"91"
y=
"351"
key=
"Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177"
timestamp=
"1595
906810375
"
/>
<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"
>
<screen
x=
"31"
y=
"23"
width=
"1889"
height=
"1177"
/>
...
...
src/panels/SuccessPrizePanel.ts
View file @
e7930e53
...
...
@@ -73,6 +73,7 @@ export class SuccessPrizePanel extends Panel {
this
.
againBtn
.
visible
=
false
;
this
.
goPrizeBtn
.
visible
=
false
;
this
.
prizeImg
.
visible
=
false
;
this
.
tipsTex
.
text
=
'满星过关!'
;
switch
(
this
.
data
.
tool
.
type
)
{
case
PropType
.
BOOMS
:
propImg
.
texture
=
RES
.
getRes
(
'boomBtn.png'
);
...
...
@@ -92,7 +93,6 @@ export class SuccessPrizePanel extends Panel {
propLabel
.
text
=
'步数道具
\
tx1'
;
break
;
}
this
.
tipsTex
.
text
=
'满星过关获得'
+
propLabel
.
text
;
}
else
if
(
this
.
data
.
prize
&&
this
.
data
.
prize
.
image
)
{
this
.
noPrizeAgainBtn
.
visible
=
false
;
this
.
prop
.
visible
=
false
;
...
...
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