Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
ET-18
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-18
Commits
3b719157
Commit
3b719157
authored
Feb 23, 2021
by
asdf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
bd1ac5d6
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
171 additions
and
42 deletions
+171
-42
Comic Sans MS.TTF
play/assets/tmpGame/fonts/Comic Sans MS.TTF
+0
-0
KGMissKindyMarker.ttf
play/assets/tmpGame/fonts/KGMissKindyMarker.ttf
+0
-0
KGMissKindyMarker.ttf.meta
play/assets/tmpGame/fonts/KGMissKindyMarker.ttf.meta
+0
-5
ahronbd.ttf
play/assets/tmpGame/fonts/ahronbd.ttf
+0
-0
ahronbd.ttf.meta
play/assets/tmpGame/fonts/ahronbd.ttf.meta
+5
-0
Scene.fire
play/assets/tmpGame/scene/Scene.fire
+57
-36
Scene.js
play/assets/tmpGame/script/Scene.js
+1
-1
play2.png
play/assets/tmpGame/textures/pack/play2.png
+0
-0
play2.png.meta
play/assets/tmpGame/textures/pack/play2.png.meta
+36
-0
play_orange1.png
play/assets/tmpGame/textures/pack/play_orange1.png
+0
-0
play_orange1.png.meta
play/assets/tmpGame/textures/pack/play_orange1.png.meta
+36
-0
play_orange2.png
play/assets/tmpGame/textures/pack/play_orange2.png
+0
-0
play_orange2.png.meta
play/assets/tmpGame/textures/pack/play_orange2.png.meta
+36
-0
No files found.
play/assets/tmpGame/fonts/Comic Sans MS.TTF
deleted
100644 → 0
View file @
bd1ac5d6
File deleted
play/assets/tmpGame/fonts/KGMissKindyMarker.ttf
deleted
100644 → 0
View file @
bd1ac5d6
File deleted
play/assets/tmpGame/fonts/KGMissKindyMarker.ttf.meta
deleted
100644 → 0
View file @
bd1ac5d6
{
"ver": "1.1.0",
"uuid": "5ae1822d-008f-4fda-994c-7e44bc02a4a1",
"subMetas": {}
}
\ No newline at end of file
play/assets/tmpGame/fonts/ahronbd.ttf
0 → 100644
View file @
3b719157
File added
play/assets/tmpGame/fonts/
Comic Sans MS.TTF
.meta
→
play/assets/tmpGame/fonts/
ahronbd.ttf
.meta
View file @
3b719157
{
"ver": "1.1.0",
"uuid": "
45471cc5-3d53-4068-99c4-591121300416
",
"uuid": "
8572a45e-0e8f-457e-ad64-35c2740bf308
",
"subMetas": {}
}
\ No newline at end of file
play/assets/tmpGame/scene/Scene.fire
View file @
3b719157
...
...
@@ -84,17 +84,14 @@
"__id__": 56
},
{
"__id__": 6
2
"__id__": 6
3
},
{
"__id__": 6
5
"__id__": 6
6
}
],
"_active": true,
"_components": [
{
"__id__": 75
},
{
"__id__": 76
},
...
...
@@ -103,6 +100,9 @@
},
{
"__id__": 78
},
{
"__id__": 79
}
],
"_prefab": null,
...
...
@@ -2584,7 +2584,7 @@
"_active": true,
"_components": [
{
"__id__": 6
1
"__id__": 6
2
}
],
"_prefab": null,
...
...
@@ -2741,6 +2741,9 @@
"_components": [
{
"__id__": 60
},
{
"__id__": 61
}
],
"_prefab": null,
...
...
@@ -2754,8 +2757,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width":
0
,
"height": 5
0
.4
"width":
244.23
,
"height": 5
4
.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
...
...
@@ -2813,7 +2816,7 @@
"_lineHeight": 40,
"_enableWrapText": true,
"_N$file": {
"__uuid__": "
bbb7f5b8-6788-4f09-bb15-e32ab0dbbdcc
"
"__uuid__": "
8572a45e-0e8f-457e-ad64-35c2740bf308
"
},
"_isSystemFontUsed": false,
"_spacingX": 0,
...
...
@@ -2827,6 +2830,24 @@
"_N$cacheMode": 0,
"_id": "56vlLJPhpLjKH4qbIMtq8o"
},
{
"__type__": "cc.LabelOutline",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 59
},
"_enabled": true,
"_color": {
"__type__": "cc.Color",
"r": 91,
"g": 104,
"b": 97,
"a": 255
},
"_width": 2,
"_id": "dbNXAM6W1JaKesBNS6fHvx"
},
{
"__type__": "cc.Widget",
"_name": "",
...
...
@@ -2865,10 +2886,10 @@
"_active": true,
"_components": [
{
"__id__": 6
3
"__id__": 6
4
},
{
"__id__": 6
4
"__id__": 6
5
}
],
"_prefab": null,
...
...
@@ -2924,7 +2945,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 6
2
"__id__": 6
3
},
"_enabled": true,
"_layoutSize": {
...
...
@@ -2956,7 +2977,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 6
2
"__id__": 6
3
},
"_enabled": true,
"alignMode": 1,
...
...
@@ -2987,19 +3008,19 @@
},
"_children": [
{
"__id__": 6
6
"__id__": 6
7
},
{
"__id__": 6
8
"__id__": 6
9
},
{
"__id__": 7
0
"__id__": 7
1
}
],
"_active": false,
"_components": [
{
"__id__": 7
4
"__id__": 7
5
}
],
"_prefab": null,
...
...
@@ -3055,13 +3076,13 @@
"_name": "oval-2",
"_objFlags": 0,
"_parent": {
"__id__": 6
5
"__id__": 6
6
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 6
7
"__id__": 6
8
}
],
"_prefab": null,
...
...
@@ -3117,7 +3138,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 6
6
"__id__": 6
7
},
"_enabled": true,
"_materials": [
...
...
@@ -3149,13 +3170,13 @@
"_name": "1",
"_objFlags": 0,
"_parent": {
"__id__": 6
5
"__id__": 6
6
},
"_children": [],
"_active": true,
"_components": [
{
"__id__":
69
"__id__":
70
}
],
"_prefab": null,
...
...
@@ -3211,7 +3232,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 6
8
"__id__": 6
9
},
"_enabled": true,
"_materials": [
...
...
@@ -3243,17 +3264,17 @@
"_name": "$btnAudio",
"_objFlags": 0,
"_parent": {
"__id__": 6
5
"__id__": 6
6
},
"_children": [
{
"__id__": 7
1
"__id__": 7
2
}
],
"_active": true,
"_components": [
{
"__id__": 7
3
"__id__": 7
4
}
],
"_prefab": null,
...
...
@@ -3309,13 +3330,13 @@
"_name": "$sprAudio",
"_objFlags": 0,
"_parent": {
"__id__": 7
0
"__id__": 7
1
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 7
2
"__id__": 7
3
}
],
"_prefab": null,
...
...
@@ -3371,7 +3392,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 7
1
"__id__": 7
2
},
"_enabled": true,
"_materials": [
...
...
@@ -3382,7 +3403,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "
621af077-00ed-4f70-b28d-614b433de24
d"
"__uuid__": "
3b4787fe-965f-44a1-9d5c-bda3b5c648b
d"
},
"_type": 0,
"_sizeMode": 1,
...
...
@@ -3403,7 +3424,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 7
0
"__id__": 7
1
},
"_enabled": true,
"_normalMaterial": null,
...
...
@@ -3476,7 +3497,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
},
"_N$target": {
"__id__": 7
0
"__id__": 7
1
},
"_id": "28Vhywz4hGv7Zkx2yg5cPL"
},
...
...
@@ -3485,7 +3506,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 6
5
"__id__": 6
6
},
"_enabled": true,
"_id": "3ft1BDcvFF+ZAxrUAa65zn"
...
...
@@ -3567,13 +3588,13 @@
},
"spfAudio": [
{
"__uuid__": "
621af077-00ed-4f70-b28d-614b433de24
d"
"__uuid__": "
3b4787fe-965f-44a1-9d5c-bda3b5c648b
d"
},
{
"__uuid__": "
621af077-00ed-4f70-b28d-614b433de24d
"
"__uuid__": "
3db72f65-884b-462d-b58e-b3dcae1b7536
"
},
{
"__uuid__": "
621af077-00ed-4f70-b28d-614b433de24d
"
"__uuid__": "
ff2df05c-531b-4767-9c2c-f792b75426ba
"
}
],
"spfLeft": [
...
...
play/assets/tmpGame/script/Scene.js
View file @
3b719157
...
...
@@ -316,7 +316,7 @@ cc.Class({
this
.
playAudio
(()
=>
{
cb
&&
cb
();
this
.
unschedule
(
this
.
changeAudioSpfCb
)
this
.
sprAudio
.
spriteFrame
=
this
.
spfAudio
[
1
];
this
.
sprAudio
.
spriteFrame
=
this
.
spfAudio
[
2
];
});
},
...
...
play/assets/tmpGame/textures/pack/play2.png
0 → 100644
View file @
3b719157
4.49 KB
play/assets/tmpGame/textures/pack/play2.png.meta
0 → 100644
View file @
3b719157
{
"ver": "2.3.5",
"uuid": "0e2d1239-828f-406a-8c17-1ca7878ac691",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 74,
"height": 82,
"platformSettings": {},
"subMetas": {
"play2": {
"ver": "1.0.4",
"uuid": "3db72f65-884b-462d-b58e-b3dcae1b7536",
"rawTextureUuid": "0e2d1239-828f-406a-8c17-1ca7878ac691",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 74,
"height": 82,
"rawWidth": 74,
"rawHeight": 82,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
play/assets/tmpGame/textures/pack/play_orange1.png
0 → 100644
View file @
3b719157
4.21 KB
play/assets/tmpGame/textures/pack/play_orange1.png.meta
0 → 100644
View file @
3b719157
{
"ver": "2.3.5",
"uuid": "3d180a43-e95e-4254-b5f3-08ef0432e944",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 74,
"height": 82,
"platformSettings": {},
"subMetas": {
"play_orange1": {
"ver": "1.0.4",
"uuid": "3b4787fe-965f-44a1-9d5c-bda3b5c648bd",
"rawTextureUuid": "3d180a43-e95e-4254-b5f3-08ef0432e944",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 74,
"height": 82,
"rawWidth": 74,
"rawHeight": 82,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
play/assets/tmpGame/textures/pack/play_orange2.png
0 → 100644
View file @
3b719157
4.99 KB
play/assets/tmpGame/textures/pack/play_orange2.png.meta
0 → 100644
View file @
3b719157
{
"ver": "2.3.5",
"uuid": "c370f1c7-d64a-4c7d-8246-0e071720b5c0",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 74,
"height": 82,
"platformSettings": {},
"subMetas": {
"play_orange2": {
"ver": "1.0.4",
"uuid": "ff2df05c-531b-4767-9c2c-f792b75426ba",
"rawTextureUuid": "c370f1c7-d64a-4c7d-8246-0e071720b5c0",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 74,
"height": 82,
"rawWidth": 74,
"rawHeight": 82,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
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