Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
choose_cake
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
template admin
choose_cake
Commits
a142afd7
Commit
a142afd7
authored
Aug 19, 2020
by
huoshizhe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: bugs
parent
04872986
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
22 deletions
+24
-22
form.component.html
form/src/app/form/form.component.html
+1
-0
choose_cake.fire
play/assets/tmpGame/scene/choose_cake.fire
+5
-5
choose_cake.js
play/assets/tmpGame/scene/choose_cake.js
+14
-13
bg_desk.png
play/assets/tmpGame/textures/bg_desk.png
+0
-0
bg_desk.png.meta
play/assets/tmpGame/textures/bg_desk.png.meta
+4
-4
No files found.
form/src/app/form/form.component.html
View file @
a142afd7
...
@@ -5,6 +5,7 @@
...
@@ -5,6 +5,7 @@
<app-audio-recorder
[
audioUrl
]="
item
.
audio
"
(
audioUploaded
)="
onAudioUploadSuccess
($
event
)"
>
<app-audio-recorder
[
audioUrl
]="
item
.
audio
"
(
audioUploaded
)="
onAudioUploadSuccess
($
event
)"
>
</app-audio-recorder>
</app-audio-recorder>
</div>
</div>
<span
style=
"height: 30px; font-size: 18px; margin-left: 20px;"
>
(正确的字母与错误的字母一共最多有五个)
</span>
<div
class=
"border"
style=
"width: 520px;"
>
<div
class=
"border"
style=
"width: 520px;"
>
<span
style=
"height: 30px; font-size: 18px;"
>
正确字母:
</span>
<span
style=
"height: 30px; font-size: 18px;"
>
正确字母:
</span>
<div>
<div>
...
...
play/assets/tmpGame/scene/choose_cake.fire
View file @
a142afd7
...
@@ -306,7 +306,7 @@
...
@@ -306,7 +306,7 @@
"array": [
"array": [
0,
0,
0,
0,
5
09.52063365780083
,
5
10.08150713208005
,
0,
0,
0,
0,
0,
0,
...
@@ -2113,7 +2113,7 @@
...
@@ -2113,7 +2113,7 @@
},
},
"_contentSize": {
"_contentSize": {
"__type__": "cc.Size",
"__type__": "cc.Size",
"width": 1
280
,
"width": 1
514
,
"height": 656
"height": 656
},
},
"_anchorPoint": {
"_anchorPoint": {
...
@@ -2193,8 +2193,8 @@
...
@@ -2193,8 +2193,8 @@
"alignMode": 1,
"alignMode": 1,
"_target": null,
"_target": null,
"_alignFlags": 44,
"_alignFlags": 44,
"_left":
0
,
"_left":
-117
,
"_right":
0
,
"_right":
-117
,
"_top": 0,
"_top": 0,
"_bottom": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_verticalCenter": 0,
...
@@ -2284,7 +2284,7 @@
...
@@ -2284,7 +2284,7 @@
},
},
"_contentSize": {
"_contentSize": {
"__type__": "cc.Size",
"__type__": "cc.Size",
"width": 1
280
,
"width": 1
514
,
"height": 656
"height": 656
},
},
"_anchorPoint": {
"_anchorPoint": {
...
...
play/assets/tmpGame/scene/choose_cake.js
View file @
a142afd7
...
@@ -38,9 +38,6 @@ cc.Class({
...
@@ -38,9 +38,6 @@ cc.Class({
},
},
start
()
{
start
()
{
let
winSize
=
cc
.
director
.
getWinSize
();
console
.
log
(
'
winSize =
'
+
JSON
.
stringify
(
winSize
));
this
.
data
=
defaultData
;
this
.
data
=
defaultData
;
this
.
getData
((
data
)
=>
{
this
.
getData
((
data
)
=>
{
if
(
data
)
{
if
(
data
)
{
...
@@ -239,7 +236,10 @@ cc.Class({
...
@@ -239,7 +236,10 @@ cc.Class({
this
.
_status
.
canCharacterWalk
=
false
;
this
.
_status
.
canCharacterWalk
=
false
;
await
this
.
characterWalk
(
cakeNode
.
getPosition
());
await
this
.
characterWalk
(
cakeNode
.
getPosition
());
await
asyncTweenBy
(
cakeNode
,
0.7
,
{
y
:
100
});
await
asyncTweenBy
(
cakeNode
,
0.7
,
{
y
:
100
});
this
.
playCakeEffect
(
cakeNode
);
this
.
characterGetCake
(
cakeNode
);
this
.
characterGetCake
(
cakeNode
);
await
this
.
characterWalk
({
x
:
0
,
y
:
50
});
await
this
.
characterWalk
({
x
:
0
,
y
:
50
});
...
@@ -259,6 +259,17 @@ cc.Class({
...
@@ -259,6 +259,17 @@ cc.Class({
this
.
_status
.
canCharacterWalk
=
true
;
this
.
_status
.
canCharacterWalk
=
true
;
},
},
playCakeEffect
(
cakeNode
)
{
const
word
=
cakeNode
.
getComponent
(
'
Cake
'
).
word
;
const
wordData
=
[
...
this
.
data
.
rightWordList
,
...
this
.
data
.
wrongWordList
].
find
(
data
=>
data
.
word
==
word
);
asyncPlayEffectByUrl
(
wordData
.
audio
);
},
characterGetCake
(
cakeNode
)
{
characterGetCake
(
cakeNode
)
{
cakeNode
.
parent
=
cc
.
find
(
'
Canvas/NodeCharacter
'
);
cakeNode
.
parent
=
cc
.
find
(
'
Canvas/NodeCharacter
'
);
cakeNode
.
x
=
0
;
cakeNode
.
x
=
0
;
...
@@ -356,7 +367,6 @@ cc.Class({
...
@@ -356,7 +367,6 @@ cc.Class({
openDoor
()
{
openDoor
()
{
const
delayTime
=
2
;
const
delayTime
=
2
;
const
nodeDoor
=
cc
.
find
(
'
Canvas/NodeDoor
'
);
const
nodeWheel1
=
cc
.
find
(
'
Canvas/NodeDoorMask/NodeWheel1
'
);
const
nodeWheel1
=
cc
.
find
(
'
Canvas/NodeDoorMask/NodeWheel1
'
);
const
nodeWheel2
=
cc
.
find
(
'
Canvas/NodeDoorMask/NodeWheel2
'
);
const
nodeWheel2
=
cc
.
find
(
'
Canvas/NodeDoorMask/NodeWheel2
'
);
const
nodeWheel3
=
cc
.
find
(
'
Canvas/NodeDoorMask/NodeWheel3
'
);
const
nodeWheel3
=
cc
.
find
(
'
Canvas/NodeDoorMask/NodeWheel3
'
);
...
@@ -376,21 +386,12 @@ cc.Class({
...
@@ -376,21 +386,12 @@ cc.Class({
.
delay
(
delayTime
)
.
delay
(
delayTime
)
.
by
(
1
,
{
y
:
-
200
})
.
by
(
1
,
{
y
:
-
200
})
.
start
();
.
start
();
// cc.tween(nodeDoor)
// .delay(delayTime)
// .by(1, { y: 300 })
// .start();
},
},
async
characterMoveOut
()
{
async
characterMoveOut
()
{
await
this
.
characterWalk
({
x
:
0
,
y
:
380
},
4
,
true
);
await
this
.
characterWalk
({
x
:
0
,
y
:
380
},
4
,
true
);
const
nodeCharacter
=
cc
.
find
(
'
Canvas/NodeCharacter
'
);
const
nodeCharacterUp
=
cc
.
find
(
'
Canvas/NodeCharacter/NodeCharacterUp
'
);
const
nodeCharacterUp
=
cc
.
find
(
'
Canvas/NodeCharacter/NodeCharacterUp
'
);
const
nodeCharacterDown
=
cc
.
find
(
'
Canvas/NodeCharacter/NodeCharacterDown
'
);
const
nodeCharacterLeft
=
cc
.
find
(
'
Canvas/NodeCharacter/NodeCharacterLeft
'
);
const
nodeCharacterRight
=
cc
.
find
(
'
Canvas/NodeCharacter/NodeCharacterRight
'
);
const
nodeCharacterFront
=
cc
.
find
(
'
Canvas/NodeCharacter/NodeCharacterFront
'
);
const
nodeCharacterFront
=
cc
.
find
(
'
Canvas/NodeCharacter/NodeCharacterFront
'
);
nodeCharacterUp
.
active
=
true
;
nodeCharacterUp
.
active
=
true
;
...
...
play/assets/tmpGame/textures/bg_desk.png
View replaced file @
04872986
View file @
a142afd7
122 KB
|
W:
|
H:
146 KB
|
W:
|
H:
2-up
Swipe
Onion skin
play/assets/tmpGame/textures/bg_desk.png.meta
View file @
a142afd7
...
@@ -22,10 +22,10 @@
...
@@ -22,10 +22,10 @@
"offsetY": 0,
"offsetY": 0,
"trimX": 0,
"trimX": 0,
"trimY": 0,
"trimY": 0,
"width": 1
280
,
"width": 1
514
,
"height":
656
,
"height":
705
,
"rawWidth": 1
280
,
"rawWidth": 1
514
,
"rawHeight":
656
,
"rawHeight":
705
,
"borderTop": 0,
"borderTop": 0,
"borderBottom": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderLeft": 0,
...
...
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