Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OP50
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
OP50
Commits
51e27ab6
Commit
51e27ab6
authored
Jul 11, 2022
by
Tt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整业务
parent
64548efa
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
41 additions
and
31 deletions
+41
-31
OP50.fire
assets/OP50/scene/OP50.fire
+16
-16
OP50.js
assets/OP50/scene/OP50.js
+22
-12
defaultData.js
assets/OP50/script/defaultData.js
+1
-1
form.component.html
form/src/app/form/form.component.html
+2
-2
No files found.
assets/OP50/scene/OP50.fire
View file @
51e27ab6
...
@@ -1122,8 +1122,8 @@
...
@@ -1122,8 +1122,8 @@
},
},
"_contentSize": {
"_contentSize": {
"__type__": "cc.Size",
"__type__": "cc.Size",
"width": 1
08
8,
"width": 1
13
8,
"height": 8
0
0
"height": 8
5
0
},
},
"_anchorPoint": {
"_anchorPoint": {
"__type__": "cc.Vec2",
"__type__": "cc.Vec2",
...
@@ -1202,10 +1202,10 @@
...
@@ -1202,10 +1202,10 @@
"alignMode": 2,
"alignMode": 2,
"_target": null,
"_target": null,
"_alignFlags": 45,
"_alignFlags": 45,
"_left": 0,
"_left":
-5
0,
"_right": 0,
"_right":
-5
0,
"_top": 0,
"_top":
-5
0,
"_bottom": 0,
"_bottom":
-5
0,
"_verticalCenter": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsLeft": true,
...
@@ -3577,7 +3577,7 @@
...
@@ -3577,7 +3577,7 @@
"_contentSize": {
"_contentSize": {
"__type__": "cc.Size",
"__type__": "cc.Size",
"width": 100,
"width": 100,
"height": 1
26
"height": 1
00.8
},
},
"_anchorPoint": {
"_anchorPoint": {
"__type__": "cc.Vec2",
"__type__": "cc.Vec2",
...
@@ -3589,7 +3589,7 @@
...
@@ -3589,7 +3589,7 @@
"ctor": "Float64Array",
"ctor": "Float64Array",
"array": [
"array": [
0,
0,
0
,
6
,
0,
0,
0,
0,
0,
0,
...
@@ -3611,7 +3611,7 @@
...
@@ -3611,7 +3611,7 @@
"_is3DNode": false,
"_is3DNode": false,
"_groupIndex": 0,
"_groupIndex": 0,
"groupIndex": 0,
"groupIndex": 0,
"_id": "
81nWvhKqxDM63sLzjAzGRE
"
"_id": "
6cLgUYBX9LJJd5b0+qVtFz
"
},
},
{
{
"__type__": "cc.Label",
"__type__": "cc.Label",
...
@@ -3628,10 +3628,10 @@
...
@@ -3628,10 +3628,10 @@
],
],
"_srcBlendFactor": 770,
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_dstBlendFactor": 771,
"_string": "
cb
a",
"_string": "a",
"_N$string": "
cb
a",
"_N$string": "a",
"_fontSize":
10
0,
"_fontSize":
8
0,
"_lineHeight":
10
0,
"_lineHeight":
8
0,
"_enableWrapText": false,
"_enableWrapText": false,
"_N$file": {
"_N$file": {
"__uuid__": "f0adf7cd-b2db-4a5a-87fe-4d818a6a6b89"
"__uuid__": "f0adf7cd-b2db-4a5a-87fe-4d818a6a6b89"
...
@@ -3646,7 +3646,7 @@
...
@@ -3646,7 +3646,7 @@
"_N$fontFamily": "Arial",
"_N$fontFamily": "Arial",
"_N$overflow": 2,
"_N$overflow": 2,
"_N$cacheMode": 0,
"_N$cacheMode": 0,
"_id": "
3bvZXPpWZNOpwqBF3GukPA
"
"_id": "
6ekY+F/EJFKJ+Pt51Af/UO
"
},
},
{
{
"__type__": "cc.Sprite",
"__type__": "cc.Sprite",
...
@@ -3695,7 +3695,7 @@
...
@@ -3695,7 +3695,7 @@
"__id__": 77
"__id__": 77
}
}
],
],
"_active":
fals
e,
"_active":
tru
e,
"_components": [
"_components": [
{
{
"__id__": 80
"__id__": 80
...
@@ -3892,7 +3892,7 @@
...
@@ -3892,7 +3892,7 @@
1,
1,
1,
1,
1,
1,
1
0
]
]
},
},
"_eulerAngles": {
"_eulerAngles": {
...
...
assets/OP50/scene/OP50.js
View file @
51e27ab6
...
@@ -566,10 +566,12 @@ cc.Class({
...
@@ -566,10 +566,12 @@ cc.Class({
audioFinished
=
true
;
audioFinished
=
true
;
let
time
=
cc
.
audioEngine
.
getDuration
(
id
);
let
time
=
cc
.
audioEngine
.
getDuration
(
id
);
this
.
showSliderAction
(
time
).
then
(()
=>
{
this
.
showSliderAction
(
time
).
then
(()
=>
{
if
(
aniFinished
&&
audioFinished
)
{
pg
.
audio
.
playAudioByUrlCall
(
this
.
_stageData
.
sound
,
()
=>
{
this
.
_playing
=
false
;
if
(
aniFinished
&&
audioFinished
)
{
resolve
(
''
);
this
.
_playing
=
false
;
}
resolve
(
''
);
}
})
});
});
})
})
}
else
{
}
else
{
...
@@ -590,10 +592,12 @@ cc.Class({
...
@@ -590,10 +592,12 @@ cc.Class({
audioFinished
=
true
;
audioFinished
=
true
;
let
time
=
cc
.
audioEngine
.
getDuration
(
id
);
let
time
=
cc
.
audioEngine
.
getDuration
(
id
);
this
.
showSliderAction
(
time
).
then
(()
=>
{
this
.
showSliderAction
(
time
).
then
(()
=>
{
if
(
aniFinished
&&
audioFinished
)
{
pg
.
audio
.
playAudioByUrlCall
(
this
.
_stageData
.
sound
,
()
=>
{
this
.
_playing
=
false
;
if
(
aniFinished
&&
audioFinished
)
{
resolve
(
''
);
this
.
_playing
=
false
;
}
resolve
(
''
);
}
});
});
});
})
})
},
1000
*
2
));
},
1000
*
2
));
...
@@ -626,10 +630,10 @@ cc.Class({
...
@@ -626,10 +630,10 @@ cc.Class({
resolve
(
""
);
resolve
(
""
);
}
else
{
}
else
{
this
.
_audio_record
=
true
;
this
.
_audio_record
=
true
;
pg
.
audio
.
playAudioByUrl
(
this
.
_cat
.
record
).
then
(()
=>
{
//
pg.audio.playAudioByUrl(this._cat.record).then(() => {
this
.
_playing
=
false
;
this
.
_playing
=
false
;
resolve
(
''
);
resolve
(
''
);
})
//
})
}
}
});
});
},
},
...
@@ -706,6 +710,8 @@ cc.Class({
...
@@ -706,6 +710,8 @@ cc.Class({
let
card_group
=
cc
.
find
(
"
card_group
"
,
this
.
node
);
let
card_group
=
cc
.
find
(
"
card_group
"
,
this
.
node
);
let
slider
=
cc
.
find
(
"
slider
"
,
card_group
);
let
slider
=
cc
.
find
(
"
slider
"
,
card_group
);
slider
.
action
=
true
;
slider
.
action
=
true
;
let
handle
=
cc
.
find
(
"
Handle
"
,
slider
);
handle
.
active
=
true
;
let
sl
=
slider
.
getComponent
(
cc
.
Slider
)
let
sl
=
slider
.
getComponent
(
cc
.
Slider
)
sl
.
progress
=
0
;
sl
.
progress
=
0
;
let
t
=
time
/
10
;
let
t
=
time
/
10
;
...
@@ -722,6 +728,10 @@ cc.Class({
...
@@ -722,6 +728,10 @@ cc.Class({
.
to
(
t
,
{
progress
:
1
}).
call
(()
=>
{
.
to
(
t
,
{
progress
:
1
}).
call
(()
=>
{
this
.
setCardColor
(
sl
.
progress
);
this
.
setCardColor
(
sl
.
progress
);
this
.
hideBox
();
this
.
hideBox
();
let
handle
=
cc
.
find
(
"
Handle
"
,
slider
);
handle
.
active
=
false
;
})
.
delay
(
0.5
).
call
(()
=>
{
return
resolve
(
""
)
return
resolve
(
""
)
})
})
.
start
();
.
start
();
...
...
assets/OP50/script/defaultData.js
View file @
51e27ab6
...
@@ -69,7 +69,7 @@ export const defaultData = {
...
@@ -69,7 +69,7 @@ export const defaultData = {
}
}
],
],
"
bgImg
"
:
"
http://staging-teach.cdn.ireadabc.com/0600790c4336c3839d90756aca5da45e.png
"
,
"
bgImg
"
:
"
http://staging-teach.cdn.ireadabc.com/0600790c4336c3839d90756aca5da45e.png
"
,
"
wordAudio
"
:
"
http://staging-teach.cdn.ireadabc.com/a
b3538f7d4d57ac1abd740bd32f06b2d
.mp3
"
,
"
wordAudio
"
:
"
http://staging-teach.cdn.ireadabc.com/a
aeb274c49f400c26b05583d481aca09
.mp3
"
,
"
imgAni
"
:
{
"
imgAni
"
:
{
"
ske
"
:
{
"
ske
"
:
{
"
url
"
:
"
http://staging-teach.cdn.ireadabc.com/dd4ede22a761f1f8ec261c93a5306f5c.json
"
,
"
url
"
:
"
http://staging-teach.cdn.ireadabc.com/dd4ede22a761f1f8ec261c93a5306f5c.json
"
,
...
...
form/src/app/form/form.component.html
View file @
51e27ab6
...
@@ -22,12 +22,12 @@
...
@@ -22,12 +22,12 @@
(
audioUploaded
)="
onAudioUploadSuccess
($
event
,
picArr
.
cat
,'
start
')"
>
(
audioUploaded
)="
onAudioUploadSuccess
($
event
,
picArr
.
cat
,'
start
')"
>
</app-audio-recorder>
</app-audio-recorder>
</div>
</div>
<span>
猫咪录音引导音频
</span>
<
!-- <
span>猫咪录音引导音频</span>
<div style="display: flex; justify-items: center; padding-top: 10px">
<div style="display: flex; justify-items: center; padding-top: 10px">
<app-audio-recorder [audioUrl]="picArr.cat.record"
<app-audio-recorder [audioUrl]="picArr.cat.record"
(audioUploaded)="onAudioUploadSuccess($event, picArr.cat,'record')">
(audioUploaded)="onAudioUploadSuccess($event, picArr.cat,'record')">
</app-audio-recorder>
</app-audio-recorder>
</div>
</div>
-->
<span>
猫咪待机音频
</span>
<span>
猫咪待机音频
</span>
<div
style=
"display: flex; justify-items: center; padding-top: 10px"
>
<div
style=
"display: flex; justify-items: center; padding-top: 10px"
>
<app-audio-recorder
[
audioUrl
]="
picArr
.
cat
.
wait
"
<app-audio-recorder
[
audioUrl
]="
picArr
.
cat
.
wait
"
...
...
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