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
278e6682
Commit
278e6682
authored
Aug 03, 2020
by
wjf
Browse files
Options
Browse Files
Download
Plain Diff
l
parents
4ff39d29
52a437f6
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
7 deletions
+5
-7
workspace.xml
.idea/workspace.xml
+3
-5
MapUI.ts
src/scene/map/MapUI.ts
+2
-2
No files found.
.idea/workspace.xml
View file @
278e6682
...
...
@@ -3,8 +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$/resource/res.json"
beforeDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/ResJson.ts"
beforeDir=
"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"
/>
...
...
@@ -130,7 +128,7 @@
<workItem
from=
"1596079283722"
duration=
"2448000"
/>
<workItem
from=
"1596185145914"
duration=
"75000"
/>
<workItem
from=
"1596187812585"
duration=
"636000"
/>
<workItem
from=
"1596418925126"
duration=
"
9113
000"
/>
<workItem
from=
"1596418925126"
duration=
"
10710
000"
/>
</task>
<task
id=
"LOCAL-00001"
summary=
"111"
>
<created>
1594122339119
</created>
...
...
@@ -518,10 +516,10 @@
</state>
<state
x=
"156"
y=
"286"
key=
"run.anything.popup/30.23.1890.1177@30.23.1890.1177"
timestamp=
"1596432664001"
/>
<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=
"15964
34723742
"
>
<state
x=
"639"
y=
"288"
width=
"671"
height=
"676"
key=
"search.everywhere.popup"
timestamp=
"15964
42931070
"
>
<screen
x=
"30"
y=
"23"
width=
"1890"
height=
"1177"
/>
</state>
<state
x=
"639"
y=
"288"
width=
"671"
height=
"676"
key=
"search.everywhere.popup/30.23.1890.1177@30.23.1890.1177"
timestamp=
"15964
34723742
"
/>
<state
x=
"639"
y=
"288"
width=
"671"
height=
"676"
key=
"search.everywhere.popup/30.23.1890.1177@30.23.1890.1177"
timestamp=
"15964
42931070
"
/>
<state
x=
"640"
y=
"288"
width=
"670"
height=
"676"
key=
"search.everywhere.popup/31.23.1889.1177@31.23.1889.1177"
timestamp=
"1595584259535"
/>
</component>
</project>
\ No newline at end of file
src/scene/map/MapUI.ts
View file @
278e6682
...
...
@@ -318,7 +318,7 @@ class PrizeBox extends Button {
const
index
=
getTbData
(
TbNetName
.
getIndex
).
data
this
.
checkTip
.
text
=
index
.
topAward
.
openPrizeStatus
?
'已开奖'
:
'8月31日
10点
'
;
?
'已开奖'
:
'8月31日
9点开奖
'
;
this
.
checkTip
.
size
=
18
;
// ? '已开奖' : '等待开奖';
// this.tip.text = `8月31日10点`;
...
...
@@ -329,7 +329,7 @@ class PrizeBox extends Button {
//有需要,到时再改
Tools
.
btnDelay
(
this
);
showToast
(
index
.
topAward
.
openPrizeStatus
?
'已开奖'
:
/* this.tip.text*/
'8月31日10
点开奖'
)
?
'已开奖'
:
'8月31日9
点开奖'
)
},
this
)
}
else
{
let
lowerLevel
=
120
;
...
...
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