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
84cc7394
Commit
84cc7394
authored
Mar 01, 2021
by
liujiaxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: ccc 240 bug
parent
f152a1f5
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
65 deletions
+12
-65
karaoke.js
.../assets/ljx_karaoke/components/karaoke/scripts/karaoke.js
+9
-62
scene.fire
play/assets/ljx_karaoke/scene/scene.fire
+3
-3
No files found.
play/assets/ljx_karaoke/components/karaoke/scripts/karaoke.js
View file @
84cc7394
...
@@ -199,15 +199,15 @@ cc.Class({
...
@@ -199,15 +199,15 @@ cc.Class({
// this.node.height = area.rect.width;
// this.node.height = area.rect.width;
// this.node.parent.zIndex = 99999
// this.node.parent.zIndex = 99999
this
.
richText
.
node
=
new
Proxy
(
this
.
richText
.
node
,
{
//
this.richText.node = new Proxy(this.richText.node , {
set
:
function
(
obj
,
key
,
val
){
//
set: function(obj, key, val){
obj
[
key
]
=
val
;
//
obj[key] = val;
return
true
;
//
return true;
},
//
},
get
:
function
(
obj
,
key
){
//
get: function(obj, key){
return
obj
[
key
]
//
return obj[key]
}
//
}
})
//
})
...
@@ -234,59 +234,6 @@ cc.Class({
...
@@ -234,59 +234,6 @@ cc.Class({
//#region
/*
const tetstData = {
"audio_url": "http://staging-teach.cdn.ireadabc.com/f5f489fc254ea526035617705c77b5dc.mp3",
"fontSize": 30,
"lineHeight": 30,
"lyrics": [
{ "time": 0.2716460000000001, "data": "Edelweiss,", "newLine": false},
{ "time": 5.095657, "data": "Edelweiss" },
{ "time": 18.944929000000016, "data": "Edelweiss,", "newLine": true },
{ "time": 23.664682000000003,"data": "Edelweiss"},
{ "time": 28.628346000000015, "data": "every", "newLine": true },
{ "time": 30.405287999999988, "data": "morning" },
{ "time": 32.296358000000026, "data": "you" },
{ "time": 32.90896, "data": "greet" },
{ "time": 35.255618, "data": "me" },
{ "time": 37.055617999999896, "data": "small", "newLine": true },
{ "time": 39.14014500000003, "data": "and" },
{ "time": 39.6218940000001, "data": "white" },
{ "time": 42.34318000000008, "data": "clean", "newLine": true },
{"time": 43.84317999999991,"data": "and"},
{"time": 44.37756099999996,"data": "bright" },
{"time": 46.85406,"data": "you","newLine": true},
{"time": 47.193516000000116,"data": "look"},
{"time": 48.42668700000001,"data": "happy"},
{"time": 50.97298399999997,"data": "to"},
{"time": 51.231684,"data": "me"}
]
}
*/
/*{
audio_url: 'http://staging-teach.cdn.ireadabc.com/5281b133df98ec29efb8ae4d8cc12bf9.mp3',
mode: 1,
lyrics: [
{time: 9.14, data: '斑驳的夜色在说什么'},
{time: 13.05, data: '谁能告诉我如何选择'},
{time: 17.19, data: '每当我想起分离时刻'},
{time: 21.30, data: '悲伤就逆流成河'},
{time: 25.62, data: '你给的温暖属于谁呢'},
{time: 29.69, data: '谁又会在乎我是谁呢'},
{time: 33.76, data: '每当我想起你的选择'},
{time: 37.89, data: '悲伤就逆流成河'},
{time: 41.68, data: ''},
{time: 58.72, data: '失去了你也是种获得'},
{time: 62.88, data: '一个人孤单未尝不可'},
{time: 66.93, data: '每当我深夜辗转反侧'},
{time: 71.02, data: '悲伤就逆流成河'},
{time: 75.14, data: '离开你也是一种快乐'},
]
};*/
//#endregion
console
.
log
(
123123
)
console
.
log
(
123123
)
this
.
richText
.
maxWidth
=
this
.
node
.
width
;
this
.
richText
.
maxWidth
=
this
.
node
.
width
;
...
...
play/assets/ljx_karaoke/scene/scene.fire
View file @
84cc7394
...
@@ -4355,7 +4355,7 @@
...
@@ -4355,7 +4355,7 @@
"_N$font": {
"_N$font": {
"__uuid__": "93a20a41-6fa2-48bf-a60d-d30a22308f7b"
"__uuid__": "93a20a41-6fa2-48bf-a60d-d30a22308f7b"
},
},
"_N$cacheMode":
1
,
"_N$cacheMode":
0
,
"_N$maxWidth": 226,
"_N$maxWidth": 226,
"_N$lineHeight": 50,
"_N$lineHeight": 50,
"_N$imageAtlas": null,
"_N$imageAtlas": null,
...
@@ -4379,7 +4379,7 @@
...
@@ -4379,7 +4379,7 @@
"node": {
"node": {
"__id__": 110
"__id__": 110
},
},
"_enabled":
fals
e,
"_enabled":
tru
e,
"alignMode": 1,
"alignMode": 1,
"_target": null,
"_target": null,
"_alignFlags": 0,
"_alignFlags": 0,
...
@@ -6219,7 +6219,7 @@
...
@@ -6219,7 +6219,7 @@
"asset": {
"asset": {
"__uuid__": "dfda5cd6-ea60-4dcd-aec2-e7e4bb1b05e6"
"__uuid__": "dfda5cd6-ea60-4dcd-aec2-e7e4bb1b05e6"
},
},
"fileId": "",
"fileId": "
c36MJ+olFFB6GMZb75Iq+4
",
"sync": false
"sync": false
},
},
{
{
...
...
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