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
771f27cc
Commit
771f27cc
authored
Oct 30, 2019
by
wildfirecode
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of gitlab2.dui88.com:wanghongyuan/xiaoxiaole into dev
parents
c1905e3b
dd5e91ab
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
6 deletions
+29
-6
MainScene.ts
egret/src/mainScene/MainScene.ts
+9
-5
Turntable.ts
egret/src/panels/TurntablePanel/Turntable.ts
+3
-0
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 @
771f27cc
...
...
@@ -1124,8 +1124,12 @@ export default class MainScene extends Scene {
lat
.
element
=
null
}
}
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
}]
});
Tool
.
removeEle
(
index
,
this
.
emptys
)
}
...
...
@@ -2476,10 +2480,10 @@ export default class MainScene extends Scene {
updateMainTimerAfterGetData
();
//submit之后再判断一次home,更新倒计时
});
const
submitData
=
DataManager
.
ins
.
getData
(
'hc_submit'
).
data
;
if
(
submitData
.
option
)
{
if
(
submitData
.
option
)
{
Loading2
.
instace
.
hide
();
PanelCtrl
.
instance
.
show
(
ModuleTypes
.
PRIZE_PANEL
,
{
level
:
this
.
chapter
,
option
:
submitData
.
option
});
}
else
{
PanelCtrl
.
instance
.
show
(
ModuleTypes
.
PRIZE_PANEL
,
{
level
:
this
.
chapter
,
option
:
submitData
.
option
});
}
else
{
Loading2
.
instace
.
hide
();
PanelCtrl
.
instance
.
show
(
ModuleTypes
.
NO_PRIZE_PANEL
,
{
level
:
this
.
chapter
});
}
...
...
egret/src/panels/TurntablePanel/Turntable.ts
View file @
771f27cc
...
...
@@ -56,6 +56,9 @@ export default class Turntable extends Panel {
initEvents
()
{
super
.
initEvents
();
if
(
this
.
data
.
onceAgain
)
{
// 再抽一次
return
;
}
this
[
"closeBtn"
].
addEventListener
(
egret
.
TouchEvent
.
TOUCH_TAP
,
this
.
onTouchTap_closeBtn
,
this
);
this
.
start_btn
.
addEventListener
(
egret
.
TouchEvent
.
TOUCH_TAP
,
this
.
onTapStart
,
this
);
this
.
rulebtn
.
addEventListener
(
egret
.
TouchEvent
.
TOUCH_TAP
,
this
.
onTapRulebtn
,
this
);
...
...
egret/src/something/chapters/Chapter3.ts
View file @
771f27cc
...
...
@@ -264,6 +264,22 @@ export const Chapters3: ChapterData[] = [
{
index
:
37
,
type
:
0
},
{
index
:
38
,
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 @
771f27cc
...
...
@@ -46,7 +46,7 @@ const config = {
data
:
'./happyclear/openTreasureBox.json'
},
'/customActivity/happyclear/home'
:
{
data
:
'./happyclear/home.json'
data
:
'./happyclear/home
max
.json'
},
'/customActivity/happyclear/getLevelInfo'
:
{
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