Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
et15_flipcard
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
et15_flipcard
Commits
3cfb5c0d
Commit
3cfb5c0d
authored
Feb 26, 2021
by
Guo Yuhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:解开空数据限制
Signed-off-by:
郭宇航
<
guoyuhang@iplayabc.com
>
parent
5b2af201
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
41 additions
and
30 deletions
+41
-30
form.component.html
form/src/app/form/form.component.html
+9
-8
flipCard.fire
play/assets/tmpGame/scene/flipCard.fire
+1
-1
flipCard.js
play/assets/tmpGame/script/flipCard.js
+31
-21
No files found.
form/src/app/form/form.component.html
View file @
3cfb5c0d
<div
class=
"model-content"
>
<div
class=
"model-content"
>
<div
style=
"padding-bottom: 20px;"
>
<input
style=
"width: 80%; margin-bottom: 0.5vw"
type=
"text"
nz-input
placeholder=
""
[(
ngModel
)]="
item
.
contentObj
.
title
"
(
blur
)="
saveItem
()"
>
<h5>
Title-sound:
</h5>
<app-audio-recorder
[
audioUrl
]="
item
.
contentObj
.
audio_url
"
(
audioUploaded
)="
onAudioUploadSuccessByItem
($
event
,
item
.
contentObj
)"
>
</app-audio-recorder>
</div>
<div
*
ngFor=
"let it of picArr; let i = index"
class=
"card-item"
style=
"padding: 0.5vw;"
>
<div
*
ngFor=
"let it of picArr; let i = index"
class=
"card-item"
style=
"padding: 0.5vw;"
>
<div
class=
"border"
>
<div
class=
"border"
>
<h5
style=
"width: 100%; line-height: 40px; text-align: center;"
>
卡片组-{{i+1}}
</h5>
<h5
style=
"width: 100%; line-height: 40px; text-align: center;"
>
卡片组-{{i+1}}
</h5>
...
@@ -99,14 +107,7 @@
...
@@ -99,14 +107,7 @@
</div>
</div>
<div
style=
"padding-bottom: 20px;"
>
<input
style=
"width: 80%; margin-bottom: 0.5vw"
type=
"text"
nz-input
placeholder=
""
[(
ngModel
)]="
item
.
contentObj
.
title
"
(
blur
)="
saveItem
()"
>
<h5>
Title-sound:
</h5>
<app-audio-recorder
[
audioUrl
]="
item
.
contentObj
.
audio_url
"
(
audioUploaded
)="
onAudioUploadSuccessByItem
($
event
,
item
.
contentObj
)"
>
</app-audio-recorder>
</div>
<!--<div style="padding-bottom: 30px;">-->
<!--<div style="padding-bottom: 30px;">-->
...
...
play/assets/tmpGame/scene/flipCard.fire
View file @
3cfb5c0d
...
@@ -183,7 +183,7 @@
...
@@ -183,7 +183,7 @@
"array": [
"array": [
0,
0,
0,
0,
53
8.655879504639
,
53
7.7898563845391
,
0,
0,
0,
0,
0,
0,
...
...
play/assets/tmpGame/script/flipCard.js
View file @
3cfb5c0d
...
@@ -90,6 +90,8 @@ cc.Class({
...
@@ -90,6 +90,8 @@ cc.Class({
_audioResList
:
null
,
_audioResList
:
null
,
_animaResList
:
null
,
_animaResList
:
null
,
_textResList
:
null
,
_textResList
:
null
,
_titleUrl
:
null
,
_titleStr
:
null
,
preloadItem
()
{
preloadItem
()
{
this
.
addPreloadImage
();
this
.
addPreloadImage
();
this
.
addPreloadAudio
();
this
.
addPreloadAudio
();
...
@@ -103,7 +105,7 @@ cc.Class({
...
@@ -103,7 +105,7 @@ cc.Class({
getDefaultData
()
{
getDefaultData
()
{
const
dataJson
=
'
{"contentObj":{"audio_url":"http://staging-teach.cdn.ireadabc.com/a4d27ad173a95823d4b8ec82363c5aa0.mp3","title":"123","picArr":[{"left":{"title":"11111111111111111111","pic_url":"http://staging-teach.cdn.ireadabc.com/156b8293a073ef828f6e01fc620c3562.png","audio_url":"http://staging-teach.cdn.ireadabc.com/83513f8d6083ebe072e3f9e47a21558a.mp3"},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"222222","pic_url":"http://staging-teach.cdn.ireadabc.com/e029bf3210a23a169f1cc14a851cc9e4.jpg","audio_url":"http://staging-teach.cdn.ireadabc.com/5285e1e88a26a08783757e9c43a8653f.mp3"},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"3333","pic_url":"http://staging-teach.cdn.ireadabc.com/89f8093ced2b9ddeccec352e9b7f2775.jpg","audio_url":"http://staging-teach.cdn.ireadabc.com/440cf9d57752b30691d90ed565e8c924.mp3"},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"444444","pic_url":"http://staging-teach.cdn.ireadabc.com/5a2c61d8faf5935e70fd9b15953b12f6.png","audio_url":"http://staging-teach.cdn.ireadabc.com/a5fa20e0c6024421b0d9a7007c303503.mp3"},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"5555","pic_url":"http://staging-teach.cdn.ireadabc.com/ce2e48ecefbf8b7011385a95133fe987.jpg","audio_url":"http://staging-teach.cdn.ireadabc.com/a41f0f2bf190396e2641ec8dada8edfe.mp3"},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"66","pic_url":"http://staging-teach.cdn.ireadabc.com/13845267419e50bd7f0c0f74ba424be2.jpg","audio_url":"http://staging-teach.cdn.ireadabc.com/32258b839eca32b6ccf94f3dd6c86e0c.mp3"},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"77777","pic_url":"http://staging-teach.cdn.ireadabc.com/7ec7599c86f974c9f88409893010811d.png","audio_url":"http://staging-teach.cdn.ireadabc.com/49ac987d13695eb411da4bef0adb318f.mp3"},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"8888888","pic_url":"http://staging-teach.cdn.ireadabc.com/24ee95ea61a2a653ce25c65557b18356.jpg","audio_url":"http://staging-teach.cdn.ireadabc.com/85cff126986f5cc11b05e95181da5869.mp3"},"right":{"title":"","pic_url":"","audio_url":""}}]}}
'
const
dataJson
=
'
{"contentObj":{"picArr":[{"left":{"title":"","pic_url":"","audio_url":""},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"","pic_url":"","audio_url":""},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"","pic_url":"","audio_url":""},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"","pic_url":"","audio_url":""},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"","pic_url":"","audio_url":""},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"","pic_url":"","audio_url":""},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"","pic_url":"","audio_url":""},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"","pic_url":"","audio_url":""},"right":{"title":"","pic_url":"","audio_url":""}}],"audio_url":"http://staging-teach.cdn.ireadabc.com/a4d27ad173a95823d4b8ec82363c5aa0.mp3","title":""},"audio_url":""}
'
;
// const dataJson = '{"contentObj":{"picArr":[{"left":{"title":"11111","pic_url":"http://staging-teach.cdn.ireadabc.com/156b8293a073ef828f6e01fc620c3562.png","audio_url":"http://staging-teach.cdn.ireadabc.com/83513f8d6083ebe072e3f9e47a21558a.mp3"},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"222222","pic_url":"http://staging-teach.cdn.ireadabc.com/e029bf3210a23a169f1cc14a851cc9e4.jpg","audio_url":"http://staging-teach.cdn.ireadabc.com/5285e1e88a26a08783757e9c43a8653f.mp3"},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"3333","pic_url":"http://staging-teach.cdn.ireadabc.com/89f8093ced2b9ddeccec352e9b7f2775.jpg","audio_url":"http://staging-teach.cdn.ireadabc.com/440cf9d57752b30691d90ed565e8c924.mp3"},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"444444","pic_url":"http://staging-teach.cdn.ireadabc.com/5a2c61d8faf5935e70fd9b15953b12f6.png","audio_url":"http://staging-teach.cdn.ireadabc.com/a5fa20e0c6024421b0d9a7007c303503.mp3"},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"5555","pic_url":"http://staging-teach.cdn.ireadabc.com/ce2e48ecefbf8b7011385a95133fe987.jpg","audio_url":"http://staging-teach.cdn.ireadabc.com/a41f0f2bf190396e2641ec8dada8edfe.mp3"},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"66","pic_url":"http://staging-teach.cdn.ireadabc.com/13845267419e50bd7f0c0f74ba424be2.jpg","audio_url":"http://staging-teach.cdn.ireadabc.com/32258b839eca32b6ccf94f3dd6c86e0c.mp3"},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"77777","pic_url":"http://staging-teach.cdn.ireadabc.com/7ec7599c86f974c9f88409893010811d.png","audio_url":"http://staging-teach.cdn.ireadabc.com/49ac987d13695eb411da4bef0adb318f.mp3"},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"8888888","pic_url":"http://staging-teach.cdn.ireadabc.com/24ee95ea61a2a653ce25c65557b18356.jpg","audio_url":"http://staging-teach.cdn.ireadabc.com/85cff126986f5cc11b05e95181da5869.mp3"},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"99999999999999999","pic_url":"http://staging-teach.cdn.ireadabc.com/3aa5a936d8e0e6f1dd2f6eb6d3d26645.jpg","audio_url":"http://staging-teach.cdn.ireadabc.com/a4d27ad173a95823d4b8ec82363c5aa0.mp3"},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"10101010101010","pic_url":"http://staging-teach.cdn.ireadabc.com/5ec43bf9507ff08d556487dee9234653.png","audio_url":"http://staging-teach.cdn.ireadabc.com/66878465ec50d162bd60fcdaa641933b.mp3"},"right":{"title":"","pic_url":"","audio_url":""}}]}}'
// const dataJson = '{"contentObj":{"picArr":[{"left":{"title":"11111","pic_url":"http://staging-teach.cdn.ireadabc.com/156b8293a073ef828f6e01fc620c3562.png","audio_url":"http://staging-teach.cdn.ireadabc.com/83513f8d6083ebe072e3f9e47a21558a.mp3"},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"222222","pic_url":"http://staging-teach.cdn.ireadabc.com/e029bf3210a23a169f1cc14a851cc9e4.jpg","audio_url":"http://staging-teach.cdn.ireadabc.com/5285e1e88a26a08783757e9c43a8653f.mp3"},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"3333","pic_url":"http://staging-teach.cdn.ireadabc.com/89f8093ced2b9ddeccec352e9b7f2775.jpg","audio_url":"http://staging-teach.cdn.ireadabc.com/440cf9d57752b30691d90ed565e8c924.mp3"},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"444444","pic_url":"http://staging-teach.cdn.ireadabc.com/5a2c61d8faf5935e70fd9b15953b12f6.png","audio_url":"http://staging-teach.cdn.ireadabc.com/a5fa20e0c6024421b0d9a7007c303503.mp3"},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"5555","pic_url":"http://staging-teach.cdn.ireadabc.com/ce2e48ecefbf8b7011385a95133fe987.jpg","audio_url":"http://staging-teach.cdn.ireadabc.com/a41f0f2bf190396e2641ec8dada8edfe.mp3"},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"66","pic_url":"http://staging-teach.cdn.ireadabc.com/13845267419e50bd7f0c0f74ba424be2.jpg","audio_url":"http://staging-teach.cdn.ireadabc.com/32258b839eca32b6ccf94f3dd6c86e0c.mp3"},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"77777","pic_url":"http://staging-teach.cdn.ireadabc.com/7ec7599c86f974c9f88409893010811d.png","audio_url":"http://staging-teach.cdn.ireadabc.com/49ac987d13695eb411da4bef0adb318f.mp3"},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"8888888","pic_url":"http://staging-teach.cdn.ireadabc.com/24ee95ea61a2a653ce25c65557b18356.jpg","audio_url":"http://staging-teach.cdn.ireadabc.com/85cff126986f5cc11b05e95181da5869.mp3"},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"99999999999999999","pic_url":"http://staging-teach.cdn.ireadabc.com/3aa5a936d8e0e6f1dd2f6eb6d3d26645.jpg","audio_url":"http://staging-teach.cdn.ireadabc.com/a4d27ad173a95823d4b8ec82363c5aa0.mp3"},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"10101010101010","pic_url":"http://staging-teach.cdn.ireadabc.com/5ec43bf9507ff08d556487dee9234653.png","audio_url":"http://staging-teach.cdn.ireadabc.com/66878465ec50d162bd60fcdaa641933b.mp3"},"right":{"title":"","pic_url":"","audio_url":""}}]}}'
const
data1
=
JSON
.
parse
(
dataJson
);
const
data1
=
JSON
.
parse
(
dataJson
);
return
data1
;
return
data1
;
...
@@ -125,27 +127,35 @@ cc.Class({
...
@@ -125,27 +127,35 @@ cc.Class({
},
},
addPreloadImage
()
{
addPreloadImage
()
{
if
(
this
.
data
.
contentObj
.
picArr
)
{
// if (this.data.contentObj.picArr) {
this
.
data
.
contentObj
.
picArr
.
forEach
(
group
=>
{
// this.data.contentObj.picArr.forEach(group => {
if
(
group
.
left
.
pic_url
&&
group
.
left
.
title
)
{
// if (group.left.pic_url && group.left.title) {
this
.
_imageResList
.
push
({
url
:
group
.
left
.
pic_url
});
// this._imageResList.push({ url: group.left.pic_url });
this
.
_textResList
.
push
({
text
:
group
.
left
.
title
});
// this._textResList.push({ text: group.left.title });
}
// }
// if (group.right) {
// // if (group.right) {
// this._imageResList.push({ url: group.right.pic_url });
// // this._imageResList.push({ url: group.right.pic_url });
// }
// // }
})
// })
}
// }
this
.
data
.
contentObj
.
picArr
.
forEach
(
group
=>
{
this
.
_imageResList
.
push
({
url
:
group
.
left
.
pic_url
});
this
.
_textResList
.
push
({
text
:
group
.
left
.
title
});
})
},
},
addPreloadAudio
()
{
addPreloadAudio
()
{
if
(
this
.
data
.
contentObj
.
picArr
)
{
// if (this.data.contentObj.picArr) {
this
.
data
.
contentObj
.
picArr
.
forEach
((
item
)
=>
{
// this.data.contentObj.picArr.forEach((item) => {
if
(
item
.
left
.
audio_url
)
{
// if (item.left.audio_url) {
this
.
_audioResList
.
push
({
url
:
item
.
left
.
audio_url
});
// this._audioResList.push({ url: item.left.audio_url });
}
// }
});
// });
}
// }
this
.
data
.
contentObj
.
picArr
.
forEach
((
item
)
=>
{
this
.
_audioResList
.
push
({
url
:
item
.
left
.
audio_url
});
});
},
},
addPreloadAnima
()
{
addPreloadAnima
()
{
...
@@ -186,7 +196,7 @@ cc.Class({
...
@@ -186,7 +196,7 @@ cc.Class({
const
bg1Node
=
signNode
.
getChildByName
(
'
bg1
'
);
const
bg1Node
=
signNode
.
getChildByName
(
'
bg1
'
);
bg1Node
.
addComponent
(
cc
.
Button
);
bg1Node
.
addComponent
(
cc
.
Button
);
var
labelTitle
=
signNode
.
getChildByName
(
'
label
'
).
getComponent
(
cc
.
Label
);
var
labelTitle
=
signNode
.
getChildByName
(
'
label
'
).
getComponent
(
cc
.
Label
);
const
data
=
this
.
getDefaultData
()
;
const
data
=
this
.
data
;
labelTitle
.
string
=
data
.
contentObj
.
title
;
labelTitle
.
string
=
data
.
contentObj
.
title
;
var
audioUrl
=
data
.
contentObj
.
audio_url
;
var
audioUrl
=
data
.
contentObj
.
audio_url
;
...
@@ -199,7 +209,7 @@ cc.Class({
...
@@ -199,7 +209,7 @@ cc.Class({
playAudio
.
play
();
playAudio
.
play
();
});
});
console
.
log
(
'
++++++++++++++++++
'
,
this
.
_imageResList
.
length
);
for
(
let
index
=
0
;
index
<
this
.
_imageResList
.
length
;
index
++
)
{
for
(
let
index
=
0
;
index
<
this
.
_imageResList
.
length
;
index
++
)
{
const
cardNode
=
cc
.
instantiate
(
cc
.
find
(
'
Canvas/Card
'
));
const
cardNode
=
cc
.
instantiate
(
cc
.
find
(
'
Canvas/Card
'
));
const
imgNode
=
cardNode
.
getChildByName
(
'
img
'
);
const
imgNode
=
cardNode
.
getChildByName
(
'
img
'
);
...
...
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