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
d64588c0
Commit
d64588c0
authored
Mar 01, 2021
by
liujiaxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: button and title
parent
84cc7394
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
207 additions
and
207 deletions
+207
-207
scene.fire
play/assets/ljx_karaoke/scene/scene.fire
+207
-207
No files found.
play/assets/ljx_karaoke/scene/scene.fire
View file @
d64588c0
...
...
@@ -78,7 +78,7 @@
"__id__": 8
},
{
"__id__": 15
9
"__id__": 15
2
},
{
"__id__": 119
...
...
@@ -384,13 +384,13 @@
"__id__": 12
},
{
"__id__": 1
51
"__id__": 1
64
}
],
"_active": true,
"_components": [
{
"__id__": 1
58
"__id__": 1
71
}
],
"_prefab": null,
...
...
@@ -592,14 +592,14 @@
"__id__": 118
},
{
"__id__": 1
55
"__id__": 1
61
},
{
"__id__": 1
56
"__id__": 1
62
}
],
"_prefab": {
"__id__": 1
57
"__id__": 1
63
},
"_opacity": 255,
"_color": {
...
...
@@ -2769,7 +2769,7 @@
},
{
"__type__": "cc.Node",
"_name": "mode
1
",
"_name": "mode
3
",
"_objFlags": 0,
"_parent": {
"__id__": 67
...
...
@@ -3378,7 +3378,7 @@
},
{
"__type__": "cc.Node",
"_name": "mode
3
",
"_name": "mode
1
",
"_objFlags": 0,
"_parent": {
"__id__": 67
...
...
@@ -5903,7 +5903,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "
00NCWBvwlGXK6nMkc678BI
"
"_id": "
dfgBDyszZGmZpK9W02TusQ
"
},
{
"__type__": "cc.Node",
...
...
@@ -5919,7 +5919,7 @@
"__id__": 148
},
{
"__id__": 1
54
"__id__": 1
60
}
],
"_prefab": null,
...
...
@@ -5968,7 +5968,7 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "
bbZUsb59RKh79VUlh+kTRL
"
"_id": "
f706OmgqdMrYYu383Xz9rZ
"
},
{
"__type__": "cc.Node",
...
...
@@ -6030,14 +6030,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "
0bNHiPOCBFCqbhL6F9qf9l
"
"_id": "
c0CWeJeGdLFrft5AaE/wXE
"
},
{
"__type__": "cc.Node",
"_name": "bg_title
copy
",
"_name": "bg_title",
"_objFlags": 0,
"_parent": {
"__id__":
8
"__id__":
152
},
"_children": [
{
...
...
@@ -6047,10 +6047,10 @@
"_active": true,
"_components": [
{
"__id__": 15
2
"__id__": 15
8
},
{
"__id__": 15
3
"__id__": 15
9
}
],
"_prefab": null,
...
...
@@ -6076,8 +6076,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
70
,
-20
,
-588.484
,
338.122
,
0,
0,
0,
...
...
@@ -6099,143 +6099,7 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "67qINnIUVKzbZ+4VHFoKoL"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 151
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "638f2c69-5b77-45da-afab-4cddfc93b372"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "ed9+lQXChArp2aPsxS5mt7"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 151
},
"_enabled": true,
"alignMode": 1,
"_target": {
"__id__": 8
},
"_alignFlags": 9,
"_left": 70,
"_right": 0,
"_top": 20,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "83eW6VU+1GuqDUMcXSRfKB"
},
{
"__type__": "cc.LabelOutline",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 149
},
"_enabled": true,
"_color": {
"__type__": "cc.Color",
"r": 68,
"g": 17,
"b": 136,
"a": 255
},
"_width": 2,
"_id": "30dhAy2SpFWpNh6E/+NZzT"
},
{
"__type__": "cc.AudioSource",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 12
},
"_enabled": true,
"_clip": {
"__uuid__": "e69cbedd-e343-46ac-830c-6cc00cbb8a12"
},
"_volume": 1,
"_mute": false,
"_loop": false,
"playOnLoad": false,
"preload": false,
"_id": "c6550+ugFN0alCQFnHhnFO"
},
{
"__type__": "cc.Animation",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 12
},
"_enabled": true,
"_defaultClip": null,
"_clips": [],
"playOnLoad": false,
"_id": "b4tnBDrXZO1anaBXdcSkAy"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 12
},
"asset": {
"__uuid__": "dfda5cd6-ea60-4dcd-aec2-e7e4bb1b05e6"
},
"fileId": "c36MJ+olFFB6GMZb75Iq+4",
"sync": false
},
{
"__type__": "a6faa3LtHJKdI5igeo8sgOO",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 8
},
"_enabled": true,
"designWidth": 1280,
"designHeight": 720,
"relativeNode": null,
"relativeX": 0,
"relativeY": 0,
"_id": "93rMDJhNFCHJwLxDdQsTyH"
"_id": "b2znc1yAtHM4DLzwMxxVd/"
},
{
"__type__": "cc.Node",
...
...
@@ -6246,19 +6110,19 @@
},
"_children": [
{
"__id__": 1
60
"__id__": 1
53
},
{
"__id__": 1
63
"__id__": 1
51
}
],
"_active":
fals
e,
"_active":
tru
e,
"_components": [
{
"__id__": 1
70
"__id__": 1
56
},
{
"__id__": 1
71
"__id__": 1
57
}
],
"_prefab": null,
...
...
@@ -6314,16 +6178,16 @@
"_name": "New Sprite",
"_objFlags": 0,
"_parent": {
"__id__": 15
9
"__id__": 15
2
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 1
61
"__id__": 1
54
},
{
"__id__": 1
62
"__id__": 1
55
}
],
"_prefab": null,
...
...
@@ -6379,7 +6243,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1
60
"__id__": 1
53
},
"_enabled": true,
"_materials": [
...
...
@@ -6411,7 +6275,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1
60
"__id__": 1
53
},
"_enabled": true,
"alignMode": 1,
...
...
@@ -6433,25 +6297,172 @@
"_originalHeight": 36,
"_id": "80NbNvgatM5Kb3dgKnahzS"
},
{
"__type__": "a6faa3LtHJKdI5igeo8sgOO",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 152
},
"_enabled": true,
"designWidth": 1280,
"designHeight": 720,
"relativeNode": null,
"relativeX": 0,
"relativeY": 0,
"_id": "776jKNjhpJEbYKLQDHFcKG"
},
{
"__type__": "b5de2RiKeJFtoc0sgD4Q3zM",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 152
},
"_enabled": true,
"relativeNode": null,
"percentX": 0,
"percentY": 0,
"_id": "cf7cokkc9JeowADQ/vjh+7"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 151
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "638f2c69-5b77-45da-afab-4cddfc93b372"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "d3w5Z+W3hMLo45v02HLUSf"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 151
},
"_enabled": false,
"alignMode": 1,
"_target": null,
"_alignFlags": 0,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "b0SKRGPQ1HeqrZXXjcLy+w"
},
{
"__type__": "cc.LabelOutline",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 149
},
"_enabled": true,
"_color": {
"__type__": "cc.Color",
"r": 68,
"g": 17,
"b": 136,
"a": 255
},
"_width": 2,
"_id": "65zyIr2lNA+5sQGtK/ENV9"
},
{
"__type__": "cc.AudioSource",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 12
},
"_enabled": true,
"_clip": {
"__uuid__": "e69cbedd-e343-46ac-830c-6cc00cbb8a12"
},
"_volume": 1,
"_mute": false,
"_loop": false,
"playOnLoad": false,
"preload": false,
"_id": "c6550+ugFN0alCQFnHhnFO"
},
{
"__type__": "cc.Animation",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 12
},
"_enabled": true,
"_defaultClip": null,
"_clips": [],
"playOnLoad": false,
"_id": "b4tnBDrXZO1anaBXdcSkAy"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 12
},
"asset": {
"__uuid__": "dfda5cd6-ea60-4dcd-aec2-e7e4bb1b05e6"
},
"fileId": "c36MJ+olFFB6GMZb75Iq+4",
"sync": false
},
{
"__type__": "cc.Node",
"_name": "bg_title",
"_name": "bg_title
copy
",
"_objFlags": 0,
"_parent": {
"__id__":
159
"__id__":
8
},
"_children": [
{
"__id__": 16
4
"__id__": 16
5
}
],
"_active":
tru
e,
"_active":
fals
e,
"_components": [
{
"__id__": 16
8
"__id__": 16
9
},
{
"__id__": 1
69
"__id__": 1
70
}
],
"_prefab": null,
...
...
@@ -6477,8 +6488,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-588.484
,
338.122
,
70
,
-20
,
0,
0,
0,
...
...
@@ -6500,18 +6511,18 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "
b2znc1yAtHM4DLzwMxxVd/
"
"_id": "
67qINnIUVKzbZ+4VHFoKoL
"
},
{
"__type__": "cc.Node",
"_name": "title_box",
"_objFlags": 0,
"_parent": {
"__id__": 16
3
"__id__": 16
4
},
"_children": [
{
"__id__": 16
5
"__id__": 16
6
}
],
"_active": true,
...
...
@@ -6562,23 +6573,23 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "
c0CWeJeGdLFrft5AaE/wXE
"
"_id": "
0bNHiPOCBFCqbhL6F9qf9l
"
},
{
"__type__": "cc.Node",
"_name": "title",
"_objFlags": 0,
"_parent": {
"__id__": 16
4
"__id__": 16
5
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 16
6
"__id__": 16
7
},
{
"__id__": 16
7
"__id__": 16
8
}
],
"_prefab": null,
...
...
@@ -6627,14 +6638,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "
f706OmgqdMrYYu383Xz9rZ
"
"_id": "
bbZUsb59RKh79VUlh+kTRL
"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 16
5
"__id__": 16
6
},
"_enabled": true,
"_materials": [
...
...
@@ -6663,14 +6674,14 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "
dfgBDyszZGmZpK9W02TusQ
"
"_id": "
00NCWBvwlGXK6nMkc678BI
"
},
{
"__type__": "cc.LabelOutline",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 16
5
"__id__": 16
6
},
"_enabled": true,
"_color": {
...
...
@@ -6681,14 +6692,14 @@
"a": 255
},
"_width": 2,
"_id": "
65zyIr2lNA+5sQGtK/ENV9
"
"_id": "
30dhAy2SpFWpNh6E/+NZzT
"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 16
3
"__id__": 16
4
},
"_enabled": true,
"_materials": [
...
...
@@ -6713,22 +6724,24 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "
d3w5Z+W3hMLo45v02HLUSf
"
"_id": "
ed9+lQXChArp2aPsxS5mt7
"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 16
3
"__id__": 16
4
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_target": {
"__id__": 8
},
"_alignFlags": 9,
"_left":
-588.484
,
"_left":
70
,
"_right": 0,
"_top":
-338.122
,
"_top":
20
,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
...
...
@@ -6740,14 +6753,14 @@
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "
b0SKRGPQ1HeqrZXXjcLy+w
"
"_id": "
83eW6VU+1GuqDUMcXSRfKB
"
},
{
"__type__": "a6faa3LtHJKdI5igeo8sgOO",
"_name": "",
"_objFlags": 0,
"node": {
"__id__":
159
"__id__":
8
},
"_enabled": true,
"designWidth": 1280,
...
...
@@ -6755,20 +6768,7 @@
"relativeNode": null,
"relativeX": 0,
"relativeY": 0,
"_id": "776jKNjhpJEbYKLQDHFcKG"
},
{
"__type__": "b5de2RiKeJFtoc0sgD4Q3zM",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 159
},
"_enabled": false,
"relativeNode": null,
"percentX": 0,
"percentY": 0,
"_id": "cf7cokkc9JeowADQ/vjh+7"
"_id": "93rMDJhNFCHJwLxDdQsTyH"
},
{
"__type__": "cc.Canvas",
...
...
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