Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
et_22
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
et_22
Commits
99758a88
Commit
99758a88
authored
Feb 26, 2021
by
liujiaxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: creator version 2.4.0
parent
562f89b9
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
32 additions
and
24 deletions
+32
-24
lrc-editor.component.ts
form/src/app/common/lrc-editor/lrc-editor.component.ts
+1
-1
LRCComponent.prefab.meta
...s/ljx_karaoke/components/karaoke/LRCComponent.prefab.meta
+1
-1
scene.fire
play/assets/ljx_karaoke/scene/scene.fire
+27
-15
scene.fire.meta
play/assets/ljx_karaoke/scene/scene.fire.meta
+1
-1
project.json
play/project.json
+1
-1
project.json
play/settings/project.json
+1
-5
No files found.
form/src/app/common/lrc-editor/lrc-editor.component.ts
View file @
99758a88
...
...
@@ -352,7 +352,7 @@ export class LrcEditorComponent implements OnInit, OnChanges, OnDestroy, AfterVi
return
((
time
/
base
)
*
this
.
waveWidth
)
;
}
calcPlayBarPositionByTime
(
time
,
returnVal
=
false
)
{
const
x
=
this
.
getXPositionByTime
(
time
)
const
x
=
this
.
getXPositionByTime
(
time
)
;
// console.log(x);
const
pos
=
`translateX(
${
x
}
px)`
;
if
(
returnVal
)
{
...
...
play/assets/ljx_karaoke/components/karaoke/LRCComponent.prefab.meta
View file @
99758a88
{
"ver": "1.2.
9
",
"ver": "1.2.
7
",
"uuid": "dfda5cd6-ea60-4dcd-aec2-e7e4bb1b05e6",
"optimizationPolicy": "AUTO",
"asyncLoadAssets": false,
...
...
play/assets/ljx_karaoke/scene/scene.fire
View file @
99758a88
...
...
@@ -189,7 +189,7 @@
"array": [
0,
0,
356.08528907167977
,
0
,
0,
0,
0,
...
...
@@ -902,7 +902,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0
.176
,
0,
0.24300000000000033,
0,
0,
...
...
@@ -1077,6 +1077,7 @@
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_useOriginalSize": true,
"_string": "",
"_N$string": "",
"_fontSize": 20,
...
...
@@ -1326,6 +1327,7 @@
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_useOriginalSize": true,
"_string": "",
"_N$string": "",
"_fontSize": 20,
...
...
@@ -1591,7 +1593,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-1
,
0
,
-100.454,
0,
0,
...
...
@@ -1766,6 +1768,7 @@
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_useOriginalSize": true,
"_string": "",
"_N$string": "",
"_fontSize": 20,
...
...
@@ -2015,6 +2018,7 @@
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_useOriginalSize": true,
"_string": "",
"_N$string": "",
"_fontSize": 20,
...
...
@@ -2332,6 +2336,7 @@
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_useOriginalSize": true,
"_string": "",
"_N$string": "",
"_fontSize": 20,
...
...
@@ -2531,11 +2536,11 @@
"node": {
"__id__": 37
},
"_enabled":
fals
e,
"_enabled":
tru
e,
"alignMode": 1,
"_target": null,
"_alignFlags": 8,
"_left":
0
,
"_left":
11
,
"_right": 0,
"_top": -1.5,
"_bottom": -1.5,
...
...
@@ -2980,6 +2985,7 @@
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_useOriginalSize": true,
"_string": "",
"_N$string": "",
"_fontSize": 20,
...
...
@@ -3229,6 +3235,7 @@
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_useOriginalSize": true,
"_string": "",
"_N$string": "",
"_fontSize": 20,
...
...
@@ -3335,7 +3342,7 @@
"node": {
"__id__": 68
},
"_enabled":
fals
e,
"_enabled":
tru
e,
"alignMode": 1,
"_target": null,
"_alignFlags": 8,
...
...
@@ -3587,6 +3594,7 @@
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_useOriginalSize": true,
"_string": "",
"_N$string": "",
"_fontSize": 20,
...
...
@@ -3836,6 +3844,7 @@
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_useOriginalSize": true,
"_string": "",
"_N$string": "",
"_fontSize": 20,
...
...
@@ -3942,7 +3951,7 @@
"node": {
"__id__": 85
},
"_enabled":
fals
e,
"_enabled":
tru
e,
"alignMode": 1,
"_target": null,
"_alignFlags": 32,
...
...
@@ -4290,8 +4299,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width":
226
,
"height":
63
"width":
1000
,
"height":
420
},
"_anchorPoint": {
"__type__": "cc.Vec2",
...
...
@@ -4367,7 +4376,7 @@
"node": {
"__id__": 110
},
"_enabled":
fals
e,
"_enabled":
tru
e,
"alignMode": 1,
"_target": null,
"_alignFlags": 45,
...
...
@@ -5222,6 +5231,7 @@
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_useOriginalSize": true,
"_string": "",
"_N$string": "",
"_fontSize": 20,
...
...
@@ -5445,6 +5455,7 @@
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_useOriginalSize": true,
"_string": "",
"_N$string": "",
"_fontSize": 20,
...
...
@@ -5529,7 +5540,7 @@
"node": {
"__id__": 127
},
"_enabled":
fals
e,
"_enabled":
tru
e,
"alignMode": 1,
"_target": null,
"_alignFlags": 0,
...
...
@@ -5695,6 +5706,7 @@
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_useOriginalSize": true,
"_string": "",
"_N$string": "",
"_fontSize": 20,
...
...
@@ -5869,6 +5881,7 @@
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_useOriginalSize": true,
"_string": "",
"_N$string": "",
"_fontSize": 50,
...
...
@@ -6060,8 +6073,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-5
70,
34
0,
70,
-2
0,
0,
0,
0,
...
...
@@ -6348,7 +6361,7 @@
"node": {
"__id__": 151
},
"_enabled":
fals
e,
"_enabled":
tru
e,
"alignMode": 1,
"_target": null,
"_alignFlags": 9,
...
...
@@ -6400,7 +6413,6 @@
"_volume": 1,
"_mute": false,
"_loop": false,
"_firstlyEnabled": true,
"playOnLoad": false,
"preload": false,
"_id": "c6550+ugFN0alCQFnHhnFO"
...
...
play/assets/ljx_karaoke/scene/scene.fire.meta
View file @
99758a88
{
"ver": "1.2.
9
",
"ver": "1.2.
7
",
"uuid": "c3f18614-c716-4f1f-899f-09f073ac6c43",
"asyncLoadAssets": false,
"autoReleaseAssets": true,
...
...
play/project.json
View file @
99758a88
...
...
@@ -3,6 +3,6 @@
"packages"
:
"packages"
,
"name"
:
"cocos_mz_001"
,
"id"
:
"07f9ce6f-9026-4d2b-9501-fb5344d83050"
,
"version"
:
"2.4.
3
"
,
"version"
:
"2.4.
0
"
,
"isNew"
:
false
}
\ No newline at end of file
play/settings/project.json
View file @
99758a88
...
...
@@ -9,11 +9,7 @@
]
],
"excluded-modules"
:
[
"3D"
,
"3D Primitive"
,
"3D Physics/cannon.js"
,
"3D Physics/Builtin"
,
"3D Particle"
"3D Physics/Builtin"
],
"preview-port"
:
7456
,
"design-resolution-width"
:
960
,
...
...
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