Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
et_01
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_01
Commits
a75f6491
Commit
a75f6491
authored
Mar 05, 2021
by
智慧
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:Greeting老师要求改成Daily Conversations
parent
1d6675a8
Changes
13
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
24 additions
and
14 deletions
+24
-14
form.component.html
form/src/app/form/form.component.html
+1
-1
DailyConversations.meta
play/assets/et_01/dragonBones/DailyConversations.meta
+0
-0
DailyConversations_ske.json
...ragonBones/DailyConversations/DailyConversations_ske.json
+1
-0
DailyConversations_ske.json.meta
...Bones/DailyConversations/DailyConversations_ske.json.meta
+5
-0
DailyConversations_tex.json
...ragonBones/DailyConversations/DailyConversations_tex.json
+1
-0
DailyConversations_tex.json.meta
...Bones/DailyConversations/DailyConversations_tex.json.meta
+5
-0
DailyConversations_tex.png
...dragonBones/DailyConversations/DailyConversations_tex.png
+0
-0
DailyConversations_tex.png.meta
...nBones/DailyConversations/DailyConversations_tex.png.meta
+5
-5
greeting_ske.json
play/assets/et_01/dragonBones/Greetings/greeting_ske.json
+0
-1
greeting_tex.json
play/assets/et_01/dragonBones/Greetings/greeting_tex.json
+0
-1
greeting_tex.png
play/assets/et_01/dragonBones/Greetings/greeting_tex.png
+0
-0
et_01.fire
play/assets/et_01/scene/et_01.fire
+4
-4
et_01.js
play/assets/et_01/script/et_01.js
+2
-2
No files found.
form/src/app/form/form.component.html
View file @
a75f6491
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
<span
class=
"label-item"
>
选择骨骼动画:
</span>
<span
class=
"label-item"
>
选择骨骼动画:
</span>
<div
style=
"padding: 10px;"
></div>
<div
style=
"padding: 10px;"
></div>
<nz-radio-group
[(
ngModel
)]="
item
.
animationName
"
nzButtonStyle=
"solid"
(
ngModelChange
)="
changeRadio
($
event
,
item
)"
>
<nz-radio-group
[(
ngModel
)]="
item
.
animationName
"
nzButtonStyle=
"solid"
(
ngModelChange
)="
changeRadio
($
event
,
item
)"
>
<label
nz-radio
nzValue=
"
Greetings"
class=
"label-item"
>
Greeting
s
</label><br/>
<label
nz-radio
nzValue=
"
DailyConversations"
class=
"label-item"
>
Daily Conversation
s
</label><br/>
<label
nz-radio
nzValue=
"WarmUp"
class=
"label-item"
>
Warm Up
</label><br/>
<label
nz-radio
nzValue=
"WarmUp"
class=
"label-item"
>
Warm Up
</label><br/>
<label
nz-radio
nzValue=
"Phonics"
class=
"label-item"
>
Phonics
</label><br/>
<label
nz-radio
nzValue=
"Phonics"
class=
"label-item"
>
Phonics
</label><br/>
<label
nz-radio
nzValue=
"LettersInLife"
class=
"label-item"
>
Letters in Life
</label><br/>
<label
nz-radio
nzValue=
"LettersInLife"
class=
"label-item"
>
Letters in Life
</label><br/>
...
...
play/assets/et_01/dragonBones/
Greeting
s.meta
→
play/assets/et_01/dragonBones/
DailyConversation
s.meta
View file @
a75f6491
File moved
play/assets/et_01/dragonBones/DailyConversations/DailyConversations_ske.json
0 → 100644
View file @
a75f6491
This diff is collapsed.
Click to expand it.
play/assets/et_01/dragonBones/
Greetings/greeting_tex
.json.meta
→
play/assets/et_01/dragonBones/
DailyConversations/DailyConversations_ske
.json.meta
View file @
a75f6491
{
{
"ver": "1.0.1",
"ver": "1.0.1",
"uuid": "
9a63896e-19b4-475d-a92c-0d4f5eacbe9c
",
"uuid": "
043b0a9c-9acb-4608-af6f-74a8c743e670
",
"subMetas": {}
"subMetas": {}
}
}
\ No newline at end of file
play/assets/et_01/dragonBones/DailyConversations/DailyConversations_tex.json
0 → 100644
View file @
a75f6491
{
"width"
:
1024
,
"imagePath"
:
"DailyConversations_tex.png"
,
"SubTexture"
:[{
"width"
:
242
,
"y"
:
493
,
"height"
:
33
,
"name"
:
"Oval"
,
"x"
:
778
},{
"width"
:
276
,
"y"
:
740
,
"height"
:
150
,
"name"
:
"1/烟雾100"
,
"x"
:
680
},{
"width"
:
291
,
"y"
:
795
,
"height"
:
153
,
"name"
:
"1/烟雾101"
,
"x"
:
1
},{
"width"
:
330
,
"y"
:
740
,
"height"
:
157
,
"name"
:
"1/烟雾102"
,
"x"
:
348
},{
"width"
:
345
,
"y"
:
636
,
"height"
:
157
,
"name"
:
"1/烟雾103"
,
"x"
:
1
},{
"width"
:
352
,
"y"
:
579
,
"height"
:
159
,
"name"
:
"1/烟雾104"
,
"x"
:
363
},{
"width"
:
360
,
"y"
:
470
,
"height"
:
164
,
"name"
:
"1/烟雾105"
,
"x"
:
1
},{
"width"
:
61
,
"y"
:
388
,
"height"
:
86
,
"name"
:
"右腿."
,
"x"
:
860
},{
"width"
:
148
,
"y"
:
304
,
"height"
:
82
,
"name"
:
"尾巴"
,
"x"
:
778
},{
"width"
:
115
,
"y"
:
579
,
"height"
:
135
,
"name"
:
"身体。"
,
"x"
:
717
},{
"width"
:
80
,
"y"
:
388
,
"height"
:
103
,
"name"
:
"右胳膊"
,
"x"
:
778
},{
"frameWidth"
:
80
,
"y"
:
470
,
"frameX"
:
0
,
"frameHeight"
:
107
,
"frameY"
:
0
,
"width"
:
80
,
"height"
:
105
,
"name"
:
"左胳膊"
,
"x"
:
363
},{
"width"
:
61
,
"y"
:
528
,
"height"
:
34
,
"name"
:
"右脚"
,
"x"
:
778
},{
"width"
:
67
,
"y"
:
528
,
"height"
:
86
,
"name"
:
"左腿."
,
"x"
:
952
},{
"width"
:
61
,
"y"
:
440
,
"height"
:
34
,
"name"
:
"左脚_"
,
"x"
:
923
},{
"width"
:
69
,
"y"
:
616
,
"height"
:
53
,
"name"
:
"裤线"
,
"x"
:
952
},{
"width"
:
450
,
"y"
:
1
,
"height"
:
467
,
"name"
:
"头发"
,
"x"
:
1
},{
"width"
:
323
,
"y"
:
304
,
"height"
:
273
,
"name"
:
"脸"
,
"x"
:
453
},{
"width"
:
67
,
"y"
:
671
,
"height"
:
54
,
"name"
:
"闭嘴"
,
"x"
:
952
},{
"width"
:
91
,
"y"
:
950
,
"height"
:
82
,
"name"
:
"睁右眼"
,
"x"
:
1
},{
"width"
:
91
,
"y"
:
899
,
"height"
:
82
,
"name"
:
"睁左眼"
,
"x"
:
294
},{
"width"
:
107
,
"y"
:
899
,
"height"
:
66
,
"name"
:
"右眼睛"
,
"x"
:
387
},{
"width"
:
18
,
"y"
:
476
,
"height"
:
14
,
"name"
:
"右眉毛"
,
"x"
:
860
},{
"width"
:
108
,
"y"
:
965
,
"height"
:
64
,
"name"
:
"右眯眼"
,
"x"
:
496
},{
"width"
:
343
,
"y"
:
892
,
"height"
:
108
,
"name"
:
"闭嘴_0"
,
"x"
:
680
},{
"width"
:
18
,
"y"
:
476
,
"height"
:
14
,
"name"
:
"左眉毛"
,
"x"
:
880
},{
"width"
:
107
,
"y"
:
950
,
"height"
:
66
,
"name"
:
"左眼睛"
,
"x"
:
94
},{
"width"
:
108
,
"y"
:
899
,
"height"
:
64
,
"name"
:
"左眯眼"
,
"x"
:
496
},{
"width"
:
500
,
"y"
:
1
,
"height"
:
301
,
"name"
:
"p"
,
"x"
:
453
},{
"width"
:
36
,
"y"
:
440
,
"height"
:
44
,
"name"
:
"左手"
,
"x"
:
986
},{
"width"
:
36
,
"y"
:
795
,
"height"
:
44
,
"name"
:
"右手"
,
"x"
:
294
},{
"width"
:
116
,
"y"
:
579
,
"height"
:
133
,
"name"
:
"右挥手 (2)"
,
"x"
:
834
},{
"width"
:
90
,
"y"
:
304
,
"height"
:
134
,
"name"
:
"形状 1"
,
"x"
:
928
},{
"width"
:
93
,
"y"
:
967
,
"height"
:
72
,
"name"
:
"张嘴"
,
"x"
:
387
}],
"height"
:
2048
,
"name"
:
"DailyConversations"
}
\ No newline at end of file
play/assets/et_01/dragonBones/
Greetings/greeting_ske
.json.meta
→
play/assets/et_01/dragonBones/
DailyConversations/DailyConversations_tex
.json.meta
View file @
a75f6491
{
{
"ver": "1.0.1",
"ver": "1.0.1",
"uuid": "
6c0f3c00-2c88-4053-ab21-61c4d9fdeb21
",
"uuid": "
86eb937d-75f7-4b71-8b1d-7c8834c1fa1b
",
"subMetas": {}
"subMetas": {}
}
}
\ No newline at end of file
play/assets/et_01/dragonBones/DailyConversations/DailyConversations_tex.png
0 → 100644
View file @
a75f6491
537 KB
play/assets/et_01/dragonBones/
Greetings/greeting
_tex.png.meta
→
play/assets/et_01/dragonBones/
DailyConversations/DailyConversations
_tex.png.meta
View file @
a75f6491
{
{
"ver": "2.3.5",
"ver": "2.3.5",
"uuid": "
84803f57-d12f-4790-be35-be515ff7b3be
",
"uuid": "
ec511775-904f-4661-8622-84404086d7b0
",
"type": "sprite",
"type": "sprite",
"wrapMode": "clamp",
"wrapMode": "clamp",
"filterMode": "bilinear",
"filterMode": "bilinear",
...
@@ -8,13 +8,13 @@
...
@@ -8,13 +8,13 @@
"genMipmaps": false,
"genMipmaps": false,
"packable": true,
"packable": true,
"width": 1024,
"width": 1024,
"height":
1024
,
"height":
2048
,
"platformSettings": {},
"platformSettings": {},
"subMetas": {
"subMetas": {
"
greeting
_tex": {
"
DailyConversations
_tex": {
"ver": "1.0.4",
"ver": "1.0.4",
"uuid": "
de2a77af-6ad8-449d-b2b5-e7da64d7d78f
",
"uuid": "
0d1c107a-2265-4042-b181-efab6893e68c
",
"rawTextureUuid": "
84803f57-d12f-4790-be35-be515ff7b3be
",
"rawTextureUuid": "
ec511775-904f-4661-8622-84404086d7b0
",
"trimType": "auto",
"trimType": "auto",
"trimThreshold": 1,
"trimThreshold": 1,
"rotated": false,
"rotated": false,
...
...
play/assets/et_01/dragonBones/Greetings/greeting_ske.json
deleted
100644 → 0
View file @
1d6675a8
This diff is collapsed.
Click to expand it.
play/assets/et_01/dragonBones/Greetings/greeting_tex.json
deleted
100644 → 0
View file @
1d6675a8
{
"width"
:
1024
,
"imagePath"
:
"greeting_tex.png"
,
"height"
:
2048
,
"name"
:
"greeting"
,
"SubTexture"
:[{
"width"
:
242
,
"y"
:
493
,
"height"
:
33
,
"name"
:
"Oval"
,
"x"
:
778
},{
"width"
:
276
,
"y"
:
740
,
"height"
:
150
,
"name"
:
"1/烟雾100"
,
"x"
:
680
},{
"width"
:
291
,
"y"
:
795
,
"height"
:
153
,
"name"
:
"1/烟雾101"
,
"x"
:
1
},{
"width"
:
330
,
"y"
:
740
,
"height"
:
157
,
"name"
:
"1/烟雾102"
,
"x"
:
348
},{
"width"
:
345
,
"y"
:
636
,
"height"
:
157
,
"name"
:
"1/烟雾103"
,
"x"
:
1
},{
"width"
:
352
,
"y"
:
579
,
"height"
:
159
,
"name"
:
"1/烟雾104"
,
"x"
:
363
},{
"width"
:
360
,
"y"
:
470
,
"height"
:
164
,
"name"
:
"1/烟雾105"
,
"x"
:
1
},{
"width"
:
61
,
"y"
:
388
,
"height"
:
86
,
"name"
:
"右腿."
,
"x"
:
860
},{
"width"
:
148
,
"y"
:
304
,
"height"
:
82
,
"name"
:
"尾巴"
,
"x"
:
778
},{
"width"
:
115
,
"y"
:
579
,
"height"
:
135
,
"name"
:
"身体。"
,
"x"
:
717
},{
"width"
:
80
,
"y"
:
388
,
"height"
:
103
,
"name"
:
"右胳膊"
,
"x"
:
778
},{
"y"
:
470
,
"frameX"
:
0
,
"frameHeight"
:
107
,
"frameY"
:
0
,
"width"
:
80
,
"frameWidth"
:
80
,
"height"
:
105
,
"name"
:
"左胳膊"
,
"x"
:
363
},{
"width"
:
61
,
"y"
:
528
,
"height"
:
34
,
"name"
:
"右脚"
,
"x"
:
778
},{
"width"
:
67
,
"y"
:
528
,
"height"
:
86
,
"name"
:
"左腿."
,
"x"
:
952
},{
"width"
:
61
,
"y"
:
440
,
"height"
:
34
,
"name"
:
"左脚_"
,
"x"
:
923
},{
"width"
:
69
,
"y"
:
616
,
"height"
:
53
,
"name"
:
"裤线"
,
"x"
:
952
},{
"width"
:
450
,
"y"
:
1
,
"height"
:
467
,
"name"
:
"头发"
,
"x"
:
1
},{
"width"
:
323
,
"y"
:
304
,
"height"
:
273
,
"name"
:
"脸"
,
"x"
:
453
},{
"width"
:
67
,
"y"
:
671
,
"height"
:
54
,
"name"
:
"闭嘴"
,
"x"
:
952
},{
"width"
:
91
,
"y"
:
950
,
"height"
:
82
,
"name"
:
"睁右眼"
,
"x"
:
1
},{
"width"
:
91
,
"y"
:
899
,
"height"
:
82
,
"name"
:
"睁左眼"
,
"x"
:
294
},{
"width"
:
107
,
"y"
:
950
,
"height"
:
66
,
"name"
:
"右眼睛"
,
"x"
:
94
},{
"width"
:
18
,
"y"
:
476
,
"height"
:
14
,
"name"
:
"右眉毛"
,
"x"
:
860
},{
"width"
:
108
,
"y"
:
965
,
"height"
:
64
,
"name"
:
"右眯眼"
,
"x"
:
496
},{
"width"
:
343
,
"y"
:
892
,
"height"
:
108
,
"name"
:
"闭嘴_0"
,
"x"
:
680
},{
"width"
:
18
,
"y"
:
476
,
"height"
:
14
,
"name"
:
"左眉毛"
,
"x"
:
880
},{
"width"
:
107
,
"y"
:
899
,
"height"
:
66
,
"name"
:
"左眼睛"
,
"x"
:
387
},{
"width"
:
108
,
"y"
:
899
,
"height"
:
64
,
"name"
:
"左眯眼"
,
"x"
:
496
},{
"width"
:
500
,
"y"
:
1
,
"height"
:
301
,
"name"
:
"p"
,
"x"
:
453
},{
"width"
:
36
,
"y"
:
440
,
"height"
:
44
,
"name"
:
"左手"
,
"x"
:
986
},{
"width"
:
36
,
"y"
:
795
,
"height"
:
44
,
"name"
:
"右手"
,
"x"
:
294
},{
"width"
:
116
,
"y"
:
579
,
"height"
:
133
,
"name"
:
"右挥手 (2)"
,
"x"
:
834
},{
"width"
:
90
,
"y"
:
304
,
"height"
:
134
,
"name"
:
"形状 1"
,
"x"
:
928
},{
"width"
:
93
,
"y"
:
967
,
"height"
:
72
,
"name"
:
"张嘴"
,
"x"
:
387
}]}
\ No newline at end of file
play/assets/et_01/dragonBones/Greetings/greeting_tex.png
deleted
100644 → 0
View file @
1d6675a8
533 KB
play/assets/et_01/scene/et_01.fire
View file @
a75f6491
...
@@ -653,7 +653,7 @@
...
@@ -653,7 +653,7 @@
},
},
{
{
"__type__": "cc.Node",
"__type__": "cc.Node",
"_name": "
Greeting
s",
"_name": "
DailyConversation
s",
"_objFlags": 0,
"_objFlags": 0,
"_parent": {
"_parent": {
"__id__": 2
"__id__": 2
...
@@ -732,7 +732,7 @@
...
@@ -732,7 +732,7 @@
"_cacheMode": 0,
"_cacheMode": 0,
"playTimes": 1,
"playTimes": 1,
"premultipliedAlpha": true,
"premultipliedAlpha": true,
"_armatureKey": "
6c0f3c00-2c88-4053-ab21-61c4d9fdeb21#9a63896e-19b4-475d-a92c-0d4f5eacbe9c
",
"_armatureKey": "
043b0a9c-9acb-4608-af6f-74a8c743e670#86eb937d-75f7-4b71-8b1d-7c8834c1fa1b
",
"_accTime": 0,
"_accTime": 0,
"_playCount": 0,
"_playCount": 0,
"_frameCache": null,
"_frameCache": null,
...
@@ -740,10 +740,10 @@
...
@@ -740,10 +740,10 @@
"_playing": false,
"_playing": false,
"_armatureCache": null,
"_armatureCache": null,
"_N$dragonAsset": {
"_N$dragonAsset": {
"__uuid__": "
6c0f3c00-2c88-4053-ab21-61c4d9fdeb21
"
"__uuid__": "
043b0a9c-9acb-4608-af6f-74a8c743e670
"
},
},
"_N$dragonAtlasAsset": {
"_N$dragonAtlasAsset": {
"__uuid__": "
9a63896e-19b4-475d-a92c-0d4f5eacbe9c
"
"__uuid__": "
86eb937d-75f7-4b71-8b1d-7c8834c1fa1b
"
},
},
"_N$_defaultArmatureIndex": 0,
"_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 1,
"_N$_animationIndex": 1,
...
...
play/assets/et_01/script/et_01.js
View file @
a75f6491
...
@@ -83,13 +83,13 @@ cc.Class({
...
@@ -83,13 +83,13 @@ cc.Class({
getDefaultData
()
{
getDefaultData
()
{
// const dataJson = '{"animationName":"Greeting
s"}'
const
dataJson
=
'
{"animationName":"DailyConversation
s"}
'
// const dataJson = '{"animationName":"WarmUp"}'
// const dataJson = '{"animationName":"WarmUp"}'
// const dataJson = '{"animationName":"LettersInLife"}'
// const dataJson = '{"animationName":"LettersInLife"}'
// const dataJson = '{"animationName":"Phonics"}'
// const dataJson = '{"animationName":"Phonics"}'
// const dataJson = '{"animationName":"LetsBlend"}'
// const dataJson = '{"animationName":"LetsBlend"}'
// const dataJson = '{"animationName":"ExerciseTime"}'
// const dataJson = '{"animationName":"ExerciseTime"}'
const
dataJson
=
'
{"animationName":"TraceWithMe"}
'
//
const dataJson = '{"animationName":"TraceWithMe"}'
// const dataJson = '{"animationName":"LookAndSay"}'
// const dataJson = '{"animationName":"LookAndSay"}'
// const dataJson = '{"animationName":"LetsReview"}'
// const dataJson = '{"animationName":"LetsReview"}'
// const dataJson = '{"animationName":"SightWords"}'
// const dataJson = '{"animationName":"SightWords"}'
...
...
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