Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
xiaoxiaole
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
wildfirecode13
xiaoxiaole
Commits
6c8dfb23
Commit
6c8dfb23
authored
Feb 17, 2020
by
wildfirecode
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of gitlab2.dui88.com:wanghongyuan/xiaoxiaole into dev
parents
5f4981a6
5709b383
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
MapTopSkin.exml
egret/resource/skins/MapTopSkin.exml
+2
-2
GuideCon.ts
egret/src/mapScene/GuideCon.ts
+2
-2
MapScene.ts
egret/src/mapScene/MapScene.ts
+2
-2
baseinfo.json
mock/happyclear/baseinfo.json
+1
-1
No files found.
egret/resource/skins/MapTopSkin.exml
View file @
6c8dfb23
...
@@ -6,8 +6,8 @@
...
@@ -6,8 +6,8 @@
<e:BitmapLabel
width=
"76"
x=
"12"
y=
"18.69"
text=
"1"
font=
"nums_fnt"
textAlign=
"center"
/>
<e:BitmapLabel
width=
"76"
x=
"12"
y=
"18.69"
text=
"1"
font=
"nums_fnt"
textAlign=
"center"
/>
</e:Group>
</e:Group>
<e:Group
id=
"icon1"
x=
"455"
y=
"691"
>
<e:Group
id=
"icon1"
x=
"455"
y=
"691"
>
<e:Image
source=
"icon_png"
x=
"
2.66"
y=
"2.66
"
/>
<e:Image
source=
"icon_png"
x=
"
0"
y=
"0
"
/>
<e:BitmapLabel
width=
"76"
x=
"12"
y=
"18.69"
text=
"2"
font=
"nums_fnt"
textAlign=
"center
"
/>
<e:BitmapLabel
width=
"76"
y=
"16.69"
text=
"2"
font=
"nums_fnt"
textAlign=
"center"
x=
"13
"
/>
</e:Group>
</e:Group>
<e:Group
x=
"321.67"
y=
"751.66"
id=
"icon2"
>
<e:Group
x=
"321.67"
y=
"751.66"
id=
"icon2"
>
<e:Image
source=
"icon_png"
x=
"0"
y=
"0"
/>
<e:Image
source=
"icon_png"
x=
"0"
y=
"0"
/>
...
...
egret/src/mapScene/GuideCon.ts
View file @
6c8dfb23
...
@@ -61,7 +61,7 @@ export class GuideCon extends egret.DisplayObjectContainer {
...
@@ -61,7 +61,7 @@ export class GuideCon extends egret.DisplayObjectContainer {
var
board
=
new
egret
.
Bitmap
(
RES
.
getRes
(
"lionMsgBg_png"
))
var
board
=
new
egret
.
Bitmap
(
RES
.
getRes
(
"lionMsgBg_png"
))
board
.
x
=
30
;
board
.
x
=
30
;
board
.
y
=
57
0
;
board
.
y
=
62
0
;
board
.
touchEnabled
=
true
;
board
.
touchEnabled
=
true
;
board
.
addEventListener
(
egret
.
TouchEvent
.
TOUCH_TAP
,
()
=>
{
board
.
addEventListener
(
egret
.
TouchEvent
.
TOUCH_TAP
,
()
=>
{
if
(
this
.
couldOver
)
{
if
(
this
.
couldOver
)
{
...
@@ -79,7 +79,7 @@ export class GuideCon extends egret.DisplayObjectContainer {
...
@@ -79,7 +79,7 @@ export class GuideCon extends egret.DisplayObjectContainer {
this
.
addChild
(
tri
);
this
.
addChild
(
tri
);
this
.
showWord
=
new
ShowWord
();
this
.
showWord
=
new
ShowWord
();
this
.
showWord
.
x
=
315
;
this
.
showWord
.
x
=
315
;
this
.
showWord
.
y
=
69
2
;
this
.
showWord
.
y
=
74
2
;
this
.
addChild
(
this
.
showWord
);
this
.
addChild
(
this
.
showWord
);
this
.
groups
=
[];
this
.
groups
=
[];
...
...
egret/src/mapScene/MapScene.ts
View file @
6c8dfb23
...
@@ -225,10 +225,10 @@ export default class MapScene extends Scene {
...
@@ -225,10 +225,10 @@ export default class MapScene extends Scene {
localStorage
.
setItem
(
'taskCenter'
+
window
[
'CFG'
].
consumerId
,
'false'
);
localStorage
.
setItem
(
'taskCenter'
+
window
[
'CFG'
].
consumerId
,
'false'
);
let
res
=
DataManager
.
ins
.
getData
(
'hc_redBombBaseInfo'
);
let
res
=
DataManager
.
ins
.
getData
(
'hc_redBombBaseInfo'
);
let
_t
=
res
.
data
.
redBombSwitchTime
;
let
_t
=
res
.
data
.
redBombSwitchTime
||
""
;
if
(
res
.
data
.
remain
>
0
)
{
if
(
res
.
data
.
remain
>
0
)
{
let
showBomb
=
localStorage
.
getItem
(
'showBomb'
+
window
[
'CFG'
].
consumerId
);
let
showBomb
=
localStorage
.
getItem
(
'showBomb'
+
window
[
'CFG'
].
consumerId
);
if
(
showBomb
!=
_t
.
toString
())
{
if
(
showBomb
!=
_t
.
toString
()
&&
_t
!=
""
)
{
localStorage
.
setItem
(
'showBomb'
+
window
[
'CFG'
].
consumerId
,
_t
.
toString
());
localStorage
.
setItem
(
'showBomb'
+
window
[
'CFG'
].
consumerId
,
_t
.
toString
());
panels
.
push
(
'BombTips2Panel'
);
panels
.
push
(
'BombTips2Panel'
);
}
}
...
...
mock/happyclear/baseinfo.json
View file @
6c8dfb23
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
"code"
:
"0000000000"
,
"code"
:
"0000000000"
,
"data"
:{
"data"
:{
"remain"
:
7
,
"remain"
:
7
,
"redBombSwitchTime"
:
77798963487234
"redBombSwitchTime"
:
"77798963487234"
},
},
"desc"
:
"OK"
,
"desc"
:
"OK"
,
"success"
:
true
,
"success"
:
true
,
...
...
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