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
dd5e91ab
Commit
dd5e91ab
authored
Oct 30, 2019
by
wjf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
l
parent
4aded47c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
6 deletions
+26
-6
MainScene.ts
egret/src/mainScene/MainScene.ts
+9
-5
Chapter3.ts
egret/src/something/chapters/Chapter3.ts
+16
-0
config.js
mock/config.js
+1
-1
No files found.
egret/src/mainScene/MainScene.ts
View file @
dd5e91ab
...
@@ -1124,8 +1124,12 @@ export default class MainScene extends Scene {
...
@@ -1124,8 +1124,12 @@ export default class MainScene extends Scene {
lat
.
element
=
null
lat
.
element
=
null
}
}
}
else
{
}
else
{
//如果有格子。无元素,是生成口
//如果有格子。无元素,是生成口,且上方没有能掉落的格子时(若有,遍历上面格子时掉落)
if
(
lat
&&
!
lat
.
element
&&
lat
.
isGenerate
)
{
if
(
lat
&&
!
lat
.
element
&&
lat
.
isGenerate
&&
!
Tool
.
judgeFall
(
this
.
lattices
[
index
-
Tool
.
colNum
])
)
{
anis
.
push
({
ele
:
null
,
indexs
:
[{
index
:
index
,
type
:
FallType
.
STRIGHT
}]
});
anis
.
push
({
ele
:
null
,
indexs
:
[{
index
:
index
,
type
:
FallType
.
STRIGHT
}]
});
Tool
.
removeEle
(
index
,
this
.
emptys
)
Tool
.
removeEle
(
index
,
this
.
emptys
)
}
}
...
@@ -2476,10 +2480,10 @@ export default class MainScene extends Scene {
...
@@ -2476,10 +2480,10 @@ export default class MainScene extends Scene {
updateMainTimerAfterGetData
();
//submit之后再判断一次home,更新倒计时
updateMainTimerAfterGetData
();
//submit之后再判断一次home,更新倒计时
});
});
const
submitData
=
DataManager
.
ins
.
getData
(
'hc_submit'
).
data
;
const
submitData
=
DataManager
.
ins
.
getData
(
'hc_submit'
).
data
;
if
(
submitData
.
option
)
{
if
(
submitData
.
option
)
{
Loading2
.
instace
.
hide
();
Loading2
.
instace
.
hide
();
PanelCtrl
.
instance
.
show
(
ModuleTypes
.
PRIZE_PANEL
,
{
level
:
this
.
chapter
,
option
:
submitData
.
option
});
PanelCtrl
.
instance
.
show
(
ModuleTypes
.
PRIZE_PANEL
,
{
level
:
this
.
chapter
,
option
:
submitData
.
option
});
}
else
{
}
else
{
Loading2
.
instace
.
hide
();
Loading2
.
instace
.
hide
();
PanelCtrl
.
instance
.
show
(
ModuleTypes
.
NO_PRIZE_PANEL
,
{
level
:
this
.
chapter
});
PanelCtrl
.
instance
.
show
(
ModuleTypes
.
NO_PRIZE_PANEL
,
{
level
:
this
.
chapter
});
}
}
...
...
egret/src/something/chapters/Chapter3.ts
View file @
dd5e91ab
...
@@ -264,6 +264,22 @@ export const Chapters3: ChapterData[] = [
...
@@ -264,6 +264,22 @@ export const Chapters3: ChapterData[] = [
{
index
:
37
,
type
:
0
},
{
index
:
37
,
type
:
0
},
{
index
:
38
,
type
:
0
},
{
index
:
38
,
type
:
0
},
{
index
:
39
,
type
:
0
},
{
index
:
39
,
type
:
0
},
{
index
:
45
,
type
:
0
},
{
index
:
46
,
type
:
0
},
{
index
:
47
,
type
:
0
},
{
index
:
48
,
type
:
0
},
{
index
:
54
,
type
:
0
},
{
index
:
55
,
type
:
0
},
{
index
:
56
,
type
:
0
},
{
index
:
57
,
type
:
0
},
{
index
:
63
,
type
:
0
},
{
index
:
64
,
type
:
0
},
{
index
:
65
,
type
:
0
},
{
index
:
66
,
type
:
0
},
]
]
}
}
},
},
...
...
mock/config.js
View file @
dd5e91ab
...
@@ -46,7 +46,7 @@ const config = {
...
@@ -46,7 +46,7 @@ const config = {
data
:
'./happyclear/openTreasureBox.json'
data
:
'./happyclear/openTreasureBox.json'
},
},
'/customActivity/happyclear/home'
:
{
'/customActivity/happyclear/home'
:
{
data
:
'./happyclear/home.json'
data
:
'./happyclear/home
max
.json'
},
},
'/customActivity/happyclear/getLevelInfo'
:
{
'/customActivity/happyclear/getLevelInfo'
:
{
data
:
'./happyclear/getLevelInfo.json'
data
:
'./happyclear/getLevelInfo.json'
...
...
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