Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OP_03_2
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
OP_03_2
Commits
d8a34880
Commit
d8a34880
authored
Nov 25, 2021
by
Chen Jiping
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:调整结束时没有拍照功能
parent
55a0b0a9
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
55 additions
and
147 deletions
+55
-147
form.component.html
form/src/app/form/form.component.html
+2
-0
OP-03-2.fire
play/assets/OP-03-2/scene/OP-03-2.fire
+47
-136
OP-03-2.js
play/assets/OP-03-2/scene/OP-03-2.js
+6
-11
No files found.
form/src/app/form/form.component.html
View file @
d8a34880
...
...
@@ -31,6 +31,7 @@
</app-audio-recorder>
</nz-form-control>
</nz-form-item>
<!--
<nz-form-item>
<nz-form-label [nzSpan]="2" nzFor="guideAudioUrl3">CC引导音频3</nz-form-label>
<nz-form-control [nzSpan]="4">
...
...
@@ -39,6 +40,7 @@
</app-audio-recorder>
</nz-form-control>
</nz-form-item>
-->
<nz-form-item>
<nz-form-label
[
nzSpan
]="
2
"
>
图片
</nz-form-label>
<nz-form-control
[
nzSpan
]="
4
"
>
...
...
play/assets/OP-03-2/scene/OP-03-2.fire
View file @
d8a34880
...
...
@@ -81,19 +81,19 @@
"__id__": 35
},
{
"__id__": 6
3
"__id__": 6
1
}
],
"_active": true,
"_components": [
{
"__id__": 6
9
"__id__": 6
7
},
{
"__id__":
70
"__id__":
68
},
{
"__id__":
71
"__id__":
69
}
],
"_prefab": null,
...
...
@@ -1623,7 +1623,7 @@
"__id__": 41
},
{
"__id__": 4
6
"__id__": 4
4
}
],
"_active": false,
...
...
@@ -1937,9 +1937,6 @@
"_children": [
{
"__id__": 42
},
{
"__id__": 44
}
],
"_active": true,
...
...
@@ -1992,94 +1989,6 @@
"groupIndex": 0,
"_id": "53LUHHG2pEr79fyrvazXJs"
},
{
"__type__": "cc.Node",
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 41
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 43
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 138,
"height": 141
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "1blU2OArJIfoC9XfupGxJG"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 42
},
"_enabled": true,
"_materials": [],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": null,
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "03GEWUEZJGyKormWgIWCtM"
},
{
"__type__": "cc.Node",
"_name": "btn_photo",
...
...
@@ -2091,7 +2000,7 @@
"_active": true,
"_components": [
{
"__id__": 4
5
"__id__": 4
3
}
],
"_prefab": null,
...
...
@@ -2147,13 +2056,15 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 4
4
"__id__": 4
2
},
"_enabled": true,
"_materials": [],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": null,
"_spriteFrame": {
"__uuid__": "a3fb2157-3337-409b-84ca-bd8b9f6ebe0f"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
...
...
@@ -2176,6 +2087,9 @@
"__id__": 35
},
"_children": [
{
"__id__": 45
},
{
"__id__": 47
},
...
...
@@ -2196,9 +2110,6 @@
},
{
"__id__": 59
},
{
"__id__": 61
}
],
"_active": true,
...
...
@@ -2256,13 +2167,13 @@
"_name": "btn",
"_objFlags": 0,
"_parent": {
"__id__": 4
6
"__id__": 4
4
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 4
8
"__id__": 4
6
}
],
"_prefab": null,
...
...
@@ -2318,7 +2229,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 4
7
"__id__": 4
5
},
"_enabled": true,
"_clip": {
...
...
@@ -2337,13 +2248,13 @@
"_name": "osmo_tip",
"_objFlags": 0,
"_parent": {
"__id__": 4
6
"__id__": 4
4
},
"_children": [],
"_active": true,
"_components": [
{
"__id__":
50
"__id__":
48
}
],
"_prefab": null,
...
...
@@ -2399,7 +2310,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 4
9
"__id__": 4
7
},
"_enabled": true,
"_clip": null,
...
...
@@ -2416,13 +2327,13 @@
"_name": "tip_success",
"_objFlags": 0,
"_parent": {
"__id__": 4
6
"__id__": 4
4
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 5
2
"__id__": 5
0
}
],
"_prefab": null,
...
...
@@ -2478,7 +2389,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__":
51
"__id__":
49
},
"_enabled": true,
"_clip": null,
...
...
@@ -2495,13 +2406,13 @@
"_name": "begin",
"_objFlags": 0,
"_parent": {
"__id__": 4
6
"__id__": 4
4
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 5
4
"__id__": 5
2
}
],
"_prefab": null,
...
...
@@ -2557,7 +2468,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 5
3
"__id__": 5
1
},
"_enabled": true,
"_clip": null,
...
...
@@ -2574,13 +2485,13 @@
"_name": "tip_letter",
"_objFlags": 0,
"_parent": {
"__id__": 4
6
"__id__": 4
4
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 5
6
"__id__": 5
4
}
],
"_prefab": null,
...
...
@@ -2636,7 +2547,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 5
5
"__id__": 5
3
},
"_enabled": true,
"_clip": null,
...
...
@@ -2653,13 +2564,13 @@
"_name": "tip_icon",
"_objFlags": 0,
"_parent": {
"__id__": 4
6
"__id__": 4
4
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 5
8
"__id__": 5
6
}
],
"_prefab": null,
...
...
@@ -2715,7 +2626,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 5
7
"__id__": 5
5
},
"_enabled": true,
"_clip": null,
...
...
@@ -2732,13 +2643,13 @@
"_name": "tip_area",
"_objFlags": 0,
"_parent": {
"__id__": 4
6
"__id__": 4
4
},
"_children": [],
"_active": true,
"_components": [
{
"__id__":
60
"__id__":
58
}
],
"_prefab": null,
...
...
@@ -2794,7 +2705,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 5
9
"__id__": 5
7
},
"_enabled": true,
"_clip": null,
...
...
@@ -2811,13 +2722,13 @@
"_name": "default",
"_objFlags": 0,
"_parent": {
"__id__": 4
6
"__id__": 4
4
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 6
2
"__id__": 6
0
}
],
"_prefab": null,
...
...
@@ -2873,7 +2784,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__":
61
"__id__":
59
},
"_enabled": true,
"_clip": null,
...
...
@@ -2894,13 +2805,13 @@
},
"_children": [
{
"__id__": 6
4
"__id__": 6
2
}
],
"_active": true,
"_components": [
{
"__id__": 6
8
"__id__": 6
6
}
],
"_prefab": null,
...
...
@@ -2956,17 +2867,17 @@
"_name": "catFrame",
"_objFlags": 0,
"_parent": {
"__id__": 6
3
"__id__": 6
1
},
"_children": [
{
"__id__": 6
5
"__id__": 6
3
}
],
"_active": true,
"_components": [
{
"__id__": 6
7
"__id__": 6
5
}
],
"_prefab": null,
...
...
@@ -3022,13 +2933,13 @@
"_name": "cat",
"_objFlags": 0,
"_parent": {
"__id__": 6
4
"__id__": 6
2
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 6
6
"__id__": 6
4
}
],
"_prefab": null,
...
...
@@ -3084,7 +2995,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 6
5
"__id__": 6
3
},
"_enabled": true,
"_materials": [
...
...
@@ -3124,7 +3035,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 6
4
"__id__": 6
2
},
"_enabled": true,
"alignMode": 2,
...
...
@@ -3153,7 +3064,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 6
3
"__id__": 6
1
},
"_enabled": true,
"_cullingMask": 4294967295,
...
...
play/assets/OP-03-2/scene/OP-03-2.js
View file @
d8a34880
...
...
@@ -343,7 +343,7 @@ cc.Class({
textNode
.
wordNodeArr
=
wordNodeArr
;
this
.
resetTextPosition
(
textNode
);
this
.
resetTextPosition
(
textNode
,
40
);
this
.
_curIndex
=
0
;
...
...
@@ -379,7 +379,7 @@ cc.Class({
textNode
.
wordNodeArr
=
wordNodeArr
;
this
.
resetTextPosition
(
textNode
);
this
.
resetTextPosition
(
textNode
,
15
);
this
.
_curIndex
=
0
;
},
...
...
@@ -510,13 +510,10 @@ cc.Class({
/**
* 重新设置文字位置
*/
resetTextPosition
(
textNode
)
{
resetTextPosition
(
textNode
,
space
=
40
)
{
let
wordNodeArr
=
textNode
.
wordNodeArr
;
//间隔
let
space
=
40
;
let
tW
=
0
;
for
(
let
i
=
0
;
i
<
wordNodeArr
.
length
;
++
i
)
{
...
...
@@ -566,10 +563,6 @@ cc.Class({
console
.
log
(
'
in showEnd
'
);
if
(
this
.
_curIndex
<
this
.
data
.
exercises
.
wordArr
.
length
)
{
return
;
}
if
(
this
.
_shown
)
{
return
;
}
...
...
@@ -751,12 +744,14 @@ cc.Class({
photoBtn
:
null
,
initPhotoBtn
()
{
console
.
log
(
"
init photoBtn
"
);
const
canvas
=
cc
.
find
(
'
Canvas
'
);
const
photoBtn
=
this
.
getSprNode
(
'
btn_photo
'
);
canvas
.
addChild
(
photoBtn
);
photoBtn
.
scale
=
this
.
_mapScaleMin
;
// photoBtn.x = 100;
photoBtn
.
y
=
-
canvas
.
height
/
2
+
photoBtn
.
height
/
2
*
photoBtn
.
scaleY
;
photoBtn
.
addComponent
(
cc
.
Button
);
...
...
@@ -772,7 +767,7 @@ cc.Class({
if
(
!
this
.
photoBtn
)
{
this
.
initPhotoBtn
();
}
this
.
photoBtn
.
active
=
true
;
this
.
photoBtn
.
active
=
true
;
console
.
log
(
this
.
photoBtn
);
},
hidePhotoBtn
()
{
...
...
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