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
a9705ebc
Commit
a9705ebc
authored
Jul 28, 2020
by
haiyoucuv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aaa
parent
8d30855a
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
10 deletions
+12
-10
workspace.xml
.idea/workspace.xml
+6
-6
babycare.gameOver.json
mock/miniTb/babycare.gameOver.json
+1
-1
SuccessNoPrizePanel.ts
src/panels/SuccessNoPrizePanel.ts
+1
-1
SuccessPrizePanel.ts
src/panels/SuccessPrizePanel.ts
+4
-2
No files found.
.idea/workspace.xml
View file @
a9705ebc
...
@@ -3,9 +3,9 @@
...
@@ -3,9 +3,9 @@
<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.g
etGameInfo.json"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/mock/miniTb/babycare.getGameInfo
.json"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/mock/miniTb/babycare.g
ameOver.json"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/mock/miniTb/babycare.gameOver
.json"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/
mock/miniTb/babycare.getIndex.json"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/mock/miniTb/babycare.getIndex.json
"
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/
scene/map/CheckBtn.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/scene/map/CheckBtn
.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 +120,7 @@
...
@@ -120,7 +120,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
4684
000"
/>
<workItem
from=
"1595820295687"
duration=
"1
6855
000"
/>
</task>
</task>
<task
id=
"LOCAL-00001"
summary=
"111"
>
<task
id=
"LOCAL-00001"
summary=
"111"
>
<created>
1594122339119
</created>
<created>
1594122339119
</created>
...
@@ -472,10 +472,10 @@
...
@@ -472,10 +472,10 @@
<screen
x=
"31"
y=
"23"
width=
"1889"
height=
"1177"
/>
<screen
x=
"31"
y=
"23"
width=
"1889"
height=
"1177"
/>
</state>
</state>
<state
x=
"157"
y=
"286"
key=
"run.anything.popup/31.23.1889.1177@31.23.1889.1177"
timestamp=
"1595475548860"
/>
<state
x=
"157"
y=
"286"
key=
"run.anything.popup/31.23.1889.1177@31.23.1889.1177"
timestamp=
"1595475548860"
/>
<state
x=
"639"
y=
"288"
width=
"671"
height=
"676"
key=
"search.everywhere.popup"
timestamp=
"15959
1816576
8"
>
<state
x=
"639"
y=
"288"
width=
"671"
height=
"676"
key=
"search.everywhere.popup"
timestamp=
"15959
2096982
8"
>
<screen
x=
"30"
y=
"23"
width=
"1890"
height=
"1177"
/>
<screen
x=
"30"
y=
"23"
width=
"1890"
height=
"1177"
/>
</state>
</state>
<state
x=
"639"
y=
"288"
width=
"671"
height=
"676"
key=
"search.everywhere.popup/30.23.1890.1177@30.23.1890.1177"
timestamp=
"15959
1816576
8"
/>
<state
x=
"639"
y=
"288"
width=
"671"
height=
"676"
key=
"search.everywhere.popup/30.23.1890.1177@30.23.1890.1177"
timestamp=
"15959
2096982
8"
/>
<state
x=
"640"
y=
"288"
width=
"670"
height=
"676"
key=
"search.everywhere.popup/31.23.1889.1177@31.23.1889.1177"
timestamp=
"1595584259535"
/>
<state
x=
"640"
y=
"288"
width=
"670"
height=
"676"
key=
"search.everywhere.popup/31.23.1889.1177@31.23.1889.1177"
timestamp=
"1595584259535"
/>
</component>
</component>
</project>
</project>
\ No newline at end of file
mock/miniTb/babycare.gameOver.json
View file @
a9705ebc
...
@@ -4,10 +4,10 @@
...
@@ -4,10 +4,10 @@
"currentLevel"
:
11
,
"currentLevel"
:
11
,
"isPrizeLevel"
:
false
,
"isPrizeLevel"
:
false
,
"tool"
:
{
"tool"
:
{
"type"
:
"HAMMERS"
,
"image"
:
"https://img.alicdn.com/imgextra/i1/2275046294/O1CN01xTeKMI1wMhRux48Y6_!!2275046294-2-miniprogram.png"
"image"
:
"https://img.alicdn.com/imgextra/i1/2275046294/O1CN01xTeKMI1wMhRux48Y6_!!2275046294-2-miniprogram.png"
},
},
"prize"
:
{
"prize"
:
{
"type"
:
"HAMMERS"
}
}
},
},
"success"
:
true
,
"success"
:
true
,
...
...
src/panels/SuccessNoPrizePanel.ts
View file @
a9705ebc
...
@@ -85,7 +85,7 @@ export class SuccessNoPrizePanel extends Panel {
...
@@ -85,7 +85,7 @@ export class SuccessNoPrizePanel extends Panel {
}
}
}
}
});
});
this
.
tipsTex
.
text
=
`
太厉害了!\n再解锁
${
dLevel
}
关可以开红包了`
;
this
.
tipsTex
.
text
=
`
\t\t\t
太厉害了!\n再解锁
${
dLevel
}
关可以开红包了`
;
this
.
tipsTex
.
textAlign
=
TEXT_ALIGN
.
CENTER
;
this
.
tipsTex
.
textAlign
=
TEXT_ALIGN
.
CENTER
;
this
.
tipsTex
.
textWidth
=
750
;
this
.
tipsTex
.
textWidth
=
750
;
this
.
tipsTex
.
x
=
0
;
this
.
tipsTex
.
x
=
0
;
...
...
src/panels/SuccessPrizePanel.ts
View file @
a9705ebc
...
@@ -54,6 +54,8 @@ export class SuccessPrizePanel extends Panel {
...
@@ -54,6 +54,8 @@ export class SuccessPrizePanel extends Panel {
this
.
checkTex
.
x
=
0
;
this
.
checkTex
.
x
=
0
;
this
.
checkTex
.
textAlign
=
TEXT_ALIGN
.
CENTER
;
this
.
checkTex
.
textAlign
=
TEXT_ALIGN
.
CENTER
;
this
.
tipsTex
.
textWidth
=
750
;
this
.
tipsTex
.
x
=
0
;
this
.
tipsTex
.
textAlign
=
TEXT_ALIGN
.
CENTER
;
this
.
tipsTex
.
textAlign
=
TEXT_ALIGN
.
CENTER
;
this
.
starGroup
=
this
.
addChild
(
new
SuccessStarGroup
());
this
.
starGroup
=
this
.
addChild
(
new
SuccessStarGroup
());
...
@@ -73,7 +75,7 @@ export class SuccessPrizePanel extends Panel {
...
@@ -73,7 +75,7 @@ export class SuccessPrizePanel extends Panel {
this
.
againBtn
.
visible
=
false
;
this
.
againBtn
.
visible
=
false
;
this
.
goPrizeBtn
.
visible
=
false
;
this
.
goPrizeBtn
.
visible
=
false
;
this
.
prizeImg
.
visible
=
false
;
this
.
prizeImg
.
visible
=
false
;
this
.
tipsTex
.
text
=
'满星过关!'
;
this
.
tipsTex
.
text
=
'
\
t
\
t
满星过关!'
;
switch
(
this
.
data
.
tool
.
type
)
{
switch
(
this
.
data
.
tool
.
type
)
{
case
PropType
.
BOOMS
:
case
PropType
.
BOOMS
:
propImg
.
texture
=
RES
.
getRes
(
'boomBtn.png'
);
propImg
.
texture
=
RES
.
getRes
(
'boomBtn.png'
);
...
@@ -97,7 +99,7 @@ export class SuccessPrizePanel extends Panel {
...
@@ -97,7 +99,7 @@ export class SuccessPrizePanel extends Panel {
this
.
noPrizeAgainBtn
.
visible
=
false
;
this
.
noPrizeAgainBtn
.
visible
=
false
;
this
.
prop
.
visible
=
false
;
this
.
prop
.
visible
=
false
;
this
.
prizeImg
.
texture
=
Texture
.
fromUrl
(
this
.
data
.
prize
.
image
);
this
.
prizeImg
.
texture
=
Texture
.
fromUrl
(
this
.
data
.
prize
.
image
);
this
.
tipsTex
.
text
=
'闯关成功!获得抽大奖机会!'
;
this
.
tipsTex
.
text
=
'
\
t
\
t
闯关成功!获得抽大奖机会!'
;
}
}
}
}
...
...
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