Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
ET06
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
ET06
Commits
82d1c79b
Commit
82d1c79b
authored
Mar 04, 2021
by
wangxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
beta 3
parent
b0f35644
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
104 additions
and
39 deletions
+104
-39
op_1.prefab
play/assets/tmpGame/prefab/op_1.prefab
+15
-15
Scene.fire
play/assets/tmpGame/scene/Scene.fire
+3
-3
Scene.js
play/assets/tmpGame/script/Scene.js
+1
-1
option.js
play/assets/tmpGame/script/option.js
+1
-10
_e-标题.png
play/assets/tmpGame/textures/_e-标题.png
+0
-0
_e-标题.png.meta
play/assets/tmpGame/textures/_e-标题.png.meta
+4
-4
图片.png
play/assets/tmpGame/textures/图片.png
+0
-0
图片.png.meta
play/assets/tmpGame/textures/图片.png.meta
+6
-6
图片11111.png
play/assets/tmpGame/textures/图片11111.png
+0
-0
图片11111.png.meta
play/assets/tmpGame/textures/图片11111.png.meta
+37
-0
描边.png
play/assets/tmpGame/textures/描边.png
+0
-0
描边.png.meta
play/assets/tmpGame/textures/描边.png.meta
+37
-0
No files found.
play/assets/tmpGame/prefab/op_1.prefab
View file @
82d1c79b
...
@@ -395,7 +395,7 @@
...
@@ -395,7 +395,7 @@
},
},
{
{
"__type__": "cc.Node",
"__type__": "cc.Node",
"_name": "
1-6@3x_select
",
"_name": "
描边
",
"_objFlags": 0,
"_objFlags": 0,
"_parent": {
"_parent": {
"__id__": 1
"__id__": 1
...
@@ -420,20 +420,20 @@
...
@@ -420,20 +420,20 @@
},
},
"_contentSize": {
"_contentSize": {
"__type__": "cc.Size",
"__type__": "cc.Size",
"width": 2
54
,
"width": 2
49
,
"height":
191
"height":
204
},
},
"_anchorPoint": {
"_anchorPoint": {
"__type__": "cc.Vec2",
"__type__": "cc.Vec2",
"x": 0.5,
"x": 0.5,
"y":
0.5
"y":
1
},
},
"_trs": {
"_trs": {
"__type__": "TypedArray",
"__type__": "TypedArray",
"ctor": "Float64Array",
"ctor": "Float64Array",
"array": [
"array": [
0,
0,
-62
,
41.879
,
0,
0,
0,
0,
0,
0,
...
@@ -470,10 +470,10 @@
...
@@ -470,10 +470,10 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
}
],
],
"_srcBlendFactor":
1
,
"_srcBlendFactor":
770
,
"_dstBlendFactor": 771,
"_dstBlendFactor": 771,
"_spriteFrame": {
"_spriteFrame": {
"__uuid__": "
8676e03d-253c-47db-aee9-45e71a343f66
"
"__uuid__": "
95c02d5d-0ed2-4971-8c12-06e460de66fc
"
},
},
"_type": 0,
"_type": 0,
"_sizeMode": 0,
"_sizeMode": 0,
...
@@ -485,7 +485,7 @@
...
@@ -485,7 +485,7 @@
},
},
"_fillStart": 0,
"_fillStart": 0,
"_fillRange": 0,
"_fillRange": 0,
"_isTrimmedMode":
tru
e,
"_isTrimmedMode":
fals
e,
"_atlas": null,
"_atlas": null,
"_id": ""
"_id": ""
},
},
...
@@ -497,7 +497,7 @@
...
@@ -497,7 +497,7 @@
"asset": {
"asset": {
"__uuid__": "46d02514-75e2-4973-9a0b-bc662330bfb3"
"__uuid__": "46d02514-75e2-4973-9a0b-bc662330bfb3"
},
},
"fileId": "
fbthVQN9JHirWz+G0IHczt
",
"fileId": "
c02kXmbtZGKYm8a92NYWKc
",
"sync": false
"sync": false
},
},
{
{
...
@@ -531,8 +531,8 @@
...
@@ -531,8 +531,8 @@
},
},
"_contentSize": {
"_contentSize": {
"__type__": "cc.Size",
"__type__": "cc.Size",
"width": 2
46
,
"width": 2
37
,
"height": 18
0
"height": 18
7
},
},
"_anchorPoint": {
"_anchorPoint": {
"__type__": "cc.Vec2",
"__type__": "cc.Vec2",
...
@@ -543,8 +543,8 @@
...
@@ -543,8 +543,8 @@
"__type__": "TypedArray",
"__type__": "TypedArray",
"ctor": "Float64Array",
"ctor": "Float64Array",
"array": [
"array": [
1
,
0
,
-6
2
,
-6
0.123
,
0,
0,
0,
0,
0,
0,
...
@@ -596,7 +596,7 @@
...
@@ -596,7 +596,7 @@
"_contentSize": {
"_contentSize": {
"__type__": "cc.Size",
"__type__": "cc.Size",
"width": 244,
"width": 244,
"height": 18
0
"height": 18
7
},
},
"_anchorPoint": {
"_anchorPoint": {
"__type__": "cc.Vec2",
"__type__": "cc.Vec2",
...
@@ -691,7 +691,7 @@
...
@@ -691,7 +691,7 @@
},
},
"_type": 2,
"_type": 2,
"_segments": 64,
"_segments": 64,
"_N$alphaThreshold": 0.
5
,
"_N$alphaThreshold": 0.
2
,
"_N$inverted": false,
"_N$inverted": false,
"_id": ""
"_id": ""
},
},
...
...
play/assets/tmpGame/scene/Scene.fire
View file @
82d1c79b
...
@@ -626,7 +626,7 @@
...
@@ -626,7 +626,7 @@
"_contentSize": {
"_contentSize": {
"__type__": "cc.Size",
"__type__": "cc.Size",
"width": 464,
"width": 464,
"height": 10
5
"height": 10
4
},
},
"_anchorPoint": {
"_anchorPoint": {
"__type__": "cc.Vec2",
"__type__": "cc.Vec2",
...
@@ -824,7 +824,7 @@
...
@@ -824,7 +824,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
}
],
],
"_srcBlendFactor":
770
,
"_srcBlendFactor":
1
,
"_dstBlendFactor": 771,
"_dstBlendFactor": 771,
"_spriteFrame": {
"_spriteFrame": {
"__uuid__": "1bc7daec-c3c3-4c4a-b65a-d0d0eb67d156"
"__uuid__": "1bc7daec-c3c3-4c4a-b65a-d0d0eb67d156"
...
@@ -856,7 +856,7 @@
...
@@ -856,7 +856,7 @@
"_alignFlags": 9,
"_alignFlags": 9,
"_left": 65,
"_left": 65,
"_right": 0,
"_right": 0,
"_top": 20,
"_top": 20
.5
,
"_bottom": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_horizontalCenter": 0,
...
...
play/assets/tmpGame/script/Scene.js
View file @
82d1c79b
...
@@ -121,7 +121,7 @@ cc.Class({
...
@@ -121,7 +121,7 @@ cc.Class({
getDefaultData
()
{
getDefaultData
()
{
const
dataJson
=
const
dataJson
=
'
{"title":"test","answer":1,"question":"hello world","options":[{"pic_url":"http://staging-teach.cdn.ireadabc.com/c5a7a94fbebdbf635952454cbe8b3371.jpeg","audio_url":"http://staging-teach.cdn.ireadabc.com/fff5204fc774e932bcd597b4094b0852.mp3","text":"选项1"},{"pic_url":"http://staging-teach.cdn.ireadabc.com/3064a1f8bec54390c031b2c2d8b84e7f.jpeg","audio_url":"http://staging-teach.cdn.ireadabc.com/e8627e7f3ec1a04fdb3660eae81f7636.mp3","text":"选项2"}],"audio_title":"http://staging-teach.cdn.ireadabc.com/f7fb9f71ab7d460ac2f78c85efba7610.mp3","audio_question":"http://staging-teach.cdn.ireadabc.com/7934cdcec68eabe639020bad5420d7f8.mp3"}
'
;
'
{"title":"test","answer":1,"question":"hello world","options":[{"pic_url":"http://staging-teach.cdn.ireadabc.com/c5a7a94fbebdbf635952454cbe8b3371.jpeg","audio_url":"http://staging-teach.cdn.ireadabc.com/fff5204fc774e932bcd597b4094b0852.mp3","text":"选项1"},{"pic_url":"http://staging-teach.cdn.ireadabc.com/3064a1f8bec54390c031b2c2d8b84e7f.jpeg","audio_url":"http://staging-teach.cdn.ireadabc.com/e8627e7f3ec1a04fdb3660eae81f7636.mp3","text":"选项2"}
,{"pic_url":"http://staging-teach.cdn.ireadabc.com/3064a1f8bec54390c031b2c2d8b84e7f.jpeg","audio_url":"http://staging-teach.cdn.ireadabc.com/e8627e7f3ec1a04fdb3660eae81f7636.mp3","text":"选项2"},{"pic_url":"http://staging-teach.cdn.ireadabc.com/3064a1f8bec54390c031b2c2d8b84e7f.jpeg","audio_url":"http://staging-teach.cdn.ireadabc.com/e8627e7f3ec1a04fdb3660eae81f7636.mp3","text":"选项2"}
],"audio_title":"http://staging-teach.cdn.ireadabc.com/f7fb9f71ab7d460ac2f78c85efba7610.mp3","audio_question":"http://staging-teach.cdn.ireadabc.com/7934cdcec68eabe639020bad5420d7f8.mp3"}
'
;
const
data
=
JSON
.
parse
(
dataJson
);
const
data
=
JSON
.
parse
(
dataJson
);
return
data
;
return
data
;
},
},
...
...
play/assets/tmpGame/script/option.js
View file @
82d1c79b
...
@@ -62,20 +62,11 @@ cc.Class({
...
@@ -62,20 +62,11 @@ cc.Class({
let
targetWidth
=
0
;
let
targetWidth
=
0
;
if
(
this
.
_count
>=
4
)
{
if
(
this
.
_count
>=
4
)
{
targetWidth
=
2
44
;
targetWidth
=
2
37
;
}
else
{
}
else
{
targetWidth
=
323
;
targetWidth
=
323
;
}
}
// let scale = 1;
// if (frameSize.height > 180) {
// scale = 168 / frameSize.height;
// }
// this.pic.spriteFrame = frame;
// this.pic.node.width = frameSize.width * scale;
// this.pic.node.height = frameSize.height * scale;
let
scale
=
1
;
let
scale
=
1
;
scale
=
targetWidth
/
frameSize
.
width
;
scale
=
targetWidth
/
frameSize
.
width
;
...
...
play/assets/tmpGame/textures/_e-标题.png
View replaced file @
b0f35644
View file @
82d1c79b
23.6 KB
|
W:
|
H:
23.5 KB
|
W:
|
H:
2-up
Swipe
Onion skin
play/assets/tmpGame/textures/_e-标题.png.meta
View file @
82d1c79b
...
@@ -4,11 +4,11 @@
...
@@ -4,11 +4,11 @@
"type": "sprite",
"type": "sprite",
"wrapMode": "clamp",
"wrapMode": "clamp",
"filterMode": "bilinear",
"filterMode": "bilinear",
"premultiplyAlpha":
fals
e,
"premultiplyAlpha":
tru
e,
"genMipmaps": false,
"genMipmaps": false,
"packable": true,
"packable": true,
"width": 464,
"width": 464,
"height": 10
5
,
"height": 10
4
,
"platformSettings": {},
"platformSettings": {},
"subMetas": {
"subMetas": {
"_e-标题": {
"_e-标题": {
...
@@ -23,9 +23,9 @@
...
@@ -23,9 +23,9 @@
"trimX": 0,
"trimX": 0,
"trimY": 0,
"trimY": 0,
"width": 464,
"width": 464,
"height": 10
5
,
"height": 10
4
,
"rawWidth": 464,
"rawWidth": 464,
"rawHeight": 10
5
,
"rawHeight": 10
4
,
"borderTop": 0,
"borderTop": 0,
"borderBottom": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderLeft": 0,
...
...
play/assets/tmpGame/textures/图片.png
View replaced file @
b0f35644
View file @
82d1c79b
66.1 KB
|
W:
|
H:
64.5 KB
|
W:
|
H:
2-up
Swipe
Onion skin
play/assets/tmpGame/textures/图片.png.meta
View file @
82d1c79b
...
@@ -7,8 +7,8 @@
...
@@ -7,8 +7,8 @@
"premultiplyAlpha": false,
"premultiplyAlpha": false,
"genMipmaps": false,
"genMipmaps": false,
"packable": true,
"packable": true,
"width": 24
3
,
"width": 24
0
,
"height": 18
0
,
"height": 18
7
,
"platformSettings": {},
"platformSettings": {},
"subMetas": {
"subMetas": {
"图片": {
"图片": {
...
@@ -22,10 +22,10 @@
...
@@ -22,10 +22,10 @@
"offsetY": 0,
"offsetY": 0,
"trimX": 0,
"trimX": 0,
"trimY": 0,
"trimY": 0,
"width": 2
43
,
"width": 2
37
,
"height": 18
0
,
"height": 18
7
,
"rawWidth": 2
43
,
"rawWidth": 2
37
,
"rawHeight": 18
0
,
"rawHeight": 18
7
,
"borderTop": 0,
"borderTop": 0,
"borderBottom": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderLeft": 0,
...
...
play/assets/tmpGame/textures/图片11111.png
0 → 100644
View file @
82d1c79b
5.12 KB
play/assets/tmpGame/textures/图片11111.png.meta
0 → 100644
View file @
82d1c79b
{
"ver": "2.3.5",
"uuid": "33a87cde-834b-4561-8a3b-8cea62aa28e8",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 237,
"height": 187,
"platformSettings": {},
"subMetas": {
"图片11111": {
"ver": "1.0.4",
"uuid": "e9d48e1d-a1c8-466f-a170-7f6ae5076c4a",
"rawTextureUuid": "33a87cde-834b-4561-8a3b-8cea62aa28e8",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 237,
"height": 187,
"rawWidth": 237,
"rawHeight": 187,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
play/assets/tmpGame/textures/描边.png
0 → 100644
View file @
82d1c79b
6.24 KB
play/assets/tmpGame/textures/描边.png.meta
0 → 100644
View file @
82d1c79b
{
"ver": "2.3.5",
"uuid": "a2b25027-52d1-4bcf-bf6c-26a7e33bb5f9",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 249,
"height": 200,
"platformSettings": {},
"subMetas": {
"描边": {
"ver": "1.0.4",
"uuid": "95c02d5d-0ed2-4971-8c12-06e460de66fc",
"rawTextureUuid": "a2b25027-52d1-4bcf-bf6c-26a7e33bb5f9",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 249,
"height": 200,
"rawWidth": 249,
"rawHeight": 200,
"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