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
22e44821
Commit
22e44821
authored
Aug 03, 2020
by
haiyoucuv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
c79a7f79
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
14 deletions
+18
-14
workspace.xml
.idea/workspace.xml
+3
-7
MapUI.ts
src/scene/map/MapUI.ts
+15
-7
No files found.
.idea/workspace.xml
View file @
22e44821
...
...
@@ -3,10 +3,6 @@
<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$/mock/miniTb/babycare.getGameInfo.json"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/mock/miniTb/babycare.getGameInfo.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$/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/scene/map/MapUI.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/scene/map/MapUI.ts"
afterDir=
"false"
/>
</list>
<option
name=
"SHOW_DIALOG"
value=
"false"
/>
...
...
@@ -132,7 +128,7 @@
<workItem
from=
"1596079283722"
duration=
"2448000"
/>
<workItem
from=
"1596185145914"
duration=
"75000"
/>
<workItem
from=
"1596187812585"
duration=
"636000"
/>
<workItem
from=
"1596418925126"
duration=
"
5389
000"
/>
<workItem
from=
"1596418925126"
duration=
"
7132
000"
/>
</task>
<task
id=
"LOCAL-00001"
summary=
"111"
>
<created>
1594122339119
</created>
...
...
@@ -479,10 +475,10 @@
<screen
x=
"31"
y=
"23"
width=
"1889"
height=
"1177"
/>
</state>
<state
x=
"82"
y=
"353"
key=
"IDE.errors.dialog/31.23.1889.1177@31.23.1889.1177"
timestamp=
"1594777965326"
/>
<state
x=
"209"
y=
"320"
key=
"RollbackChangesDialog"
timestamp=
"159643
4350752
"
>
<state
x=
"209"
y=
"320"
key=
"RollbackChangesDialog"
timestamp=
"159643
5067937
"
>
<screen
x=
"30"
y=
"23"
width=
"1890"
height=
"1177"
/>
</state>
<state
x=
"209"
y=
"320"
key=
"RollbackChangesDialog/30.23.1890.1177@30.23.1890.1177"
timestamp=
"159643
4350752
"
/>
<state
x=
"209"
y=
"320"
key=
"RollbackChangesDialog/30.23.1890.1177@30.23.1890.1177"
timestamp=
"159643
5067937
"
/>
<state
x=
"210"
y=
"320"
key=
"RollbackChangesDialog/31.23.1889.1177@31.23.1889.1177"
timestamp=
"1594173186663"
/>
<state
x=
"289"
y=
"314"
key=
"SettingsEditor"
timestamp=
"1596079390860"
>
<screen
x=
"30"
y=
"23"
width=
"1890"
height=
"1177"
/>
...
...
src/scene/map/MapUI.ts
View file @
22e44821
...
...
@@ -268,6 +268,7 @@ class PrizeBox extends Button {
private
initUi
(
data
)
{
this
.
position
.
set
(
553
,
289
);
// this.position.set(503, 289);
this
.
scale
.
set
(
1.2
,
1.2
);
this
.
checkTip
=
this
.
addChild
(
Tools
.
getText
(
...
...
@@ -285,12 +286,12 @@ class PrizeBox extends Button {
this
.
prizeImg
=
this
.
addChild
(
Tools
.
getSprite
(
'map_star_enable.png'
,
39
,
150
));
// 490*180
this
.
prizeImg
.
width
=
98
;
this
.
prizeImg
.
height
=
3
6
;
this
.
prizeImg
.
width
=
125
;
this
.
prizeImg
.
height
=
4
6
;
this
.
prizeImg
.
scale
.
set
(
1.2
,
1.2
);
this
.
prizeImg
.
x
=
(
this
.
width
-
98
)
/
2
-
15
;
this
.
prizeImg
.
x
=
(
this
.
width
-
98
)
/
2
-
28
;
// this.prizeImg.anchorTexture.x = 0.5;
this
.
prizeImg
.
y
-=
1
1
;
this
.
prizeImg
.
y
-=
1
2
;
const
prizes
=
Tools
.
gameData
.
prizes
;
if
(
prizes
.
length
<=
0
)
{
...
...
@@ -318,9 +319,16 @@ class PrizeBox extends Button {
const
index
=
getTbData
(
TbNetName
.
getIndex
).
data
this
.
checkTip
.
text
=
index
.
topAward
.
openPrizeStatus
?
'已开奖'
:
'等待开奖'
;
this
.
tip
.
text
=
`8月28日10点`
;
this
.
prizeImg
.
y
+=
4
;
?
'已开奖'
:
'8月31日10点'
;
this
.
checkTip
.
size
=
18
;
// ? '已开奖' : '等待开奖';
// this.tip.text = `8月31日10点`;
this
.
tip
.
text
=
``
;
this
.
prizeImg
.
y
-=
28
;
this
.
prizeImg
.
width
=
204
;
this
.
prizeImg
.
height
=
80
;
this
.
prizeImg
.
x
=
(
this
.
width
-
98
)
/
2
-
70
;
this
.
prizeImg
.
texture
=
Texture
.
fromUrl
(
Tools
.
baseInfo
.
levelPrize
[
'level_120'
]);
this
.
addEventListener
(
FYGE
.
MouseEvent
.
CLICK
,
()
=>
{
//有需要,到时再改
...
...
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