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
eb42d66c
Commit
eb42d66c
authored
Aug 03, 2020
by
haiyoucuv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
120未中奖不弹弹窗
parent
52a437f6
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
workspace.xml
.idea/workspace.xml
+3
-4
MapScene.ts
src/scene/map/MapScene.ts
+1
-1
No files found.
.idea/workspace.xml
View file @
eb42d66c
...
@@ -3,7 +3,6 @@
...
@@ -3,7 +3,6 @@
<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$/src/scene/map/MapUI.ts"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/scene/map/MapUI.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"
/>
...
@@ -128,7 +127,7 @@
...
@@ -128,7 +127,7 @@
<workItem
from=
"1596079283722"
duration=
"2448000"
/>
<workItem
from=
"1596079283722"
duration=
"2448000"
/>
<workItem
from=
"1596185145914"
duration=
"75000"
/>
<workItem
from=
"1596185145914"
duration=
"75000"
/>
<workItem
from=
"1596187812585"
duration=
"636000"
/>
<workItem
from=
"1596187812585"
duration=
"636000"
/>
<workItem
from=
"1596418925126"
duration=
"1
071
0000"
/>
<workItem
from=
"1596418925126"
duration=
"1
147
0000"
/>
</task>
</task>
<task
id=
"LOCAL-00001"
summary=
"111"
>
<task
id=
"LOCAL-00001"
summary=
"111"
>
<created>
1594122339119
</created>
<created>
1594122339119
</created>
...
@@ -516,10 +515,10 @@
...
@@ -516,10 +515,10 @@
</state>
</state>
<state
x=
"156"
y=
"286"
key=
"run.anything.popup/30.23.1890.1177@30.23.1890.1177"
timestamp=
"1596432664001"
/>
<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=
"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=
"159644
2931070
"
>
<state
x=
"639"
y=
"288"
width=
"671"
height=
"676"
key=
"search.everywhere.popup"
timestamp=
"159644
5983396
"
>
<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=
"159644
2931070
"
/>
<state
x=
"639"
y=
"288"
width=
"671"
height=
"676"
key=
"search.everywhere.popup/30.23.1890.1177@30.23.1890.1177"
timestamp=
"159644
5983396
"
/>
<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
src/scene/map/MapScene.ts
View file @
eb42d66c
...
@@ -66,7 +66,7 @@ export class MapScene extends Scene {
...
@@ -66,7 +66,7 @@ export class MapScene extends Scene {
if
(
Tools
.
gameData
.
topAward
.
prize
&&
Tools
.
gameData
.
topAward
.
prize
.
_id
)
{
// 有奖
if
(
Tools
.
gameData
.
topAward
.
prize
&&
Tools
.
gameData
.
topAward
.
prize
.
_id
)
{
// 有奖
showPanel
(
PrizePanel
,
JSON
.
parse
(
JSON
.
stringify
(
Tools
.
gameData
.
topAward
.
prize
)));
showPanel
(
PrizePanel
,
JSON
.
parse
(
JSON
.
stringify
(
Tools
.
gameData
.
topAward
.
prize
)));
}
else
{
// 没奖
}
else
{
// 没奖
showPanel
(
NoPrizePanel
);
//
showPanel(NoPrizePanel);
}
}
Tools
.
gameData
.
topAward
=
null
;
Tools
.
gameData
.
topAward
=
null
;
}
}
...
...
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