Skip to content
This repository has been archived by the owner on Jan 27, 2021. It is now read-only.

Huge updates #27

Merged
merged 16 commits into from
Nov 3, 2017
Merged

Huge updates #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
4ad70f5
Tried to fix (#26) Uncaught TypeError
xiazeyu Oct 27, 2017
a992565
Deleted package-lock.json to solve dependencies problems, and update …
xiazeyu Oct 27, 2017
4a79abe
Write new README
xiazeyu Oct 27, 2017
b3041f3
增加模型左右设置(#10)(#19)(#21)(#23) 增加移动端模型更多功能(#12)
xiazeyu Oct 28, 2017
d5a6c9b
Update READMEs
xiazeyu Oct 28, 2017
58453ec
仅生成选择的模型(#14) 模型列表移除(#14) 请注意README中的路径要求！
xiazeyu Oct 28, 2017
1ae7b69
Update READMEs
xiazeyu Oct 28, 2017
9045f96
optimize attaching models' file structure
xiazeyu Oct 28, 2017
f22ce35
Fix bugs and improve coding
xiazeyu Oct 30, 2017
48a84c7
Fixed config issue
xiazeyu Oct 30, 2017
e18da32
Improve file structure
xiazeyu Nov 2, 2017
7570106
Rebuild script
xiazeyu Nov 2, 2017
e8332a2
Update README
xiazeyu Nov 2, 2017
5fc7796
Add custom model path at root directory
xiazeyu Nov 2, 2017
94560f7
change bottomOffset to verticalOffset
EYHN Nov 3, 2017
97ad909
update version
EYHN Nov 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
50 changes: 25 additions & 25 deletions assets/Epsilon2.1/Epsilon2.1.model.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"version":"Sample 1.0.0",
"model":"Epsilon2.1.moc",
"model":"moc/Epsilon2.1.moc",
"textures":[
"Epsilon2.1.2048/texture_00.png"
"moc/Epsilon2.1.2048/texture_00.png"
],
"layout":
{
Expand All @@ -11,34 +11,34 @@
"width":2
},
"expressions":[
{"name":"f04.exp.json","file":"expressions/f04.exp.json"},
{"name":"f05.exp.json","file":"expressions/f05.exp.json"},
{"name":"f06.exp.json","file":"expressions/f06.exp.json"},
{"name":"f07.exp.json","file":"expressions/f07.exp.json"},
{"name":"f08.exp.json","file":"expressions/f08.exp.json"},
{"name":"f01.exp.json","file":"expressions/f01.exp.json"},
{"name":"f02.exp.json","file":"expressions/f02.exp.json"},
{"name":"f03.exp.json","file":"expressions/f03.exp.json"}
{"name":"f04.exp.json","file":"exp/f04.exp.json"},
{"name":"f05.exp.json","file":"exp/f05.exp.json"},
{"name":"f06.exp.json","file":"exp/f06.exp.json"},
{"name":"f07.exp.json","file":"exp/f07.exp.json"},
{"name":"f08.exp.json","file":"exp/f08.exp.json"},
{"name":"f01.exp.json","file":"exp/f01.exp.json"},
{"name":"f02.exp.json","file":"exp/f02.exp.json"},
{"name":"f03.exp.json","file":"exp/f03.exp.json"}
],
"motions":{
"":[
{"file":"motions/Epsilon2.1_m_01.mtn"},
{"file":"motions/Epsilon2.1_m_02.mtn"},
{"file":"motions/Epsilon2.1_m_03.mtn"},
{"file":"motions/Epsilon2.1_m_04.mtn"},
{"file":"motions/Epsilon2.1_m_05.mtn"},
{"file":"motions/Epsilon2.1_m_06.mtn"},
{"file":"motions/Epsilon2.1_m_07.mtn"},
{"file":"motions/Epsilon2.1_m_08.mtn"},
{"file":"motions/Epsilon2.1_m_sp_01.mtn"},
{"file":"motions/Epsilon2.1_m_sp_02.mtn"},
{"file":"motions/Epsilon2.1_m_sp_03.mtn"},
{"file":"motions/Epsilon2.1_m_sp_04.mtn"},
{"file":"motions/Epsilon2.1_m_sp_05.mtn"},
{"file":"motions/Epsilon2.1_shake_01.mtn"}
{"file":"mtn/Epsilon2.1_m_01.mtn"},
{"file":"mtn/Epsilon2.1_m_02.mtn"},
{"file":"mtn/Epsilon2.1_m_03.mtn"},
{"file":"mtn/Epsilon2.1_m_04.mtn"},
{"file":"mtn/Epsilon2.1_m_05.mtn"},
{"file":"mtn/Epsilon2.1_m_06.mtn"},
{"file":"mtn/Epsilon2.1_m_07.mtn"},
{"file":"mtn/Epsilon2.1_m_08.mtn"},
{"file":"mtn/Epsilon2.1_m_sp_01.mtn"},
{"file":"mtn/Epsilon2.1_m_sp_02.mtn"},
{"file":"mtn/Epsilon2.1_m_sp_03.mtn"},
{"file":"mtn/Epsilon2.1_m_sp_04.mtn"},
{"file":"mtn/Epsilon2.1_m_sp_05.mtn"},
{"file":"mtn/Epsilon2.1_shake_01.mtn"}
],
"idle":[
{"file":"motions/Epsilon2.1_idle_01.mtn"}
{"file":"mtn/Epsilon2.1_idle_01.mtn"}
]
},
"physics":"Epsilon2.1.physics.json"
Expand Down
0 assets/Epsilon2.1/expressions/f01.exp.json → assets/Epsilon2.1/exp/f01.exp.json
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 assets/Epsilon2.1/expressions/f02.exp.json → assets/Epsilon2.1/exp/f02.exp.json
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 assets/Epsilon2.1/expressions/f03.exp.json → assets/Epsilon2.1/exp/f03.exp.json
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 assets/Epsilon2.1/expressions/f04.exp.json → assets/Epsilon2.1/exp/f04.exp.json
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 assets/Epsilon2.1/expressions/f05.exp.json → assets/Epsilon2.1/exp/f05.exp.json
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 assets/Epsilon2.1/expressions/f06.exp.json → assets/Epsilon2.1/exp/f06.exp.json
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 assets/Epsilon2.1/expressions/f07.exp.json → assets/Epsilon2.1/exp/f07.exp.json
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 assets/Epsilon2.1/expressions/f08.exp.json → assets/Epsilon2.1/exp/f08.exp.json
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 ...Epsilon2.1/Epsilon2.1.2048/texture_00.png → ...lon2.1/moc/Epsilon2.1.2048/texture_00.png
100755 → 100644
View file
Open in desktop
File renamed without changes
0 assets/Epsilon2.1/Epsilon2.1.moc → assets/Epsilon2.1/moc/Epsilon2.1.moc
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 ...Epsilon2.1/motions/Epsilon2.1_idle_01.mtn → assets/Epsilon2.1/mtn/Epsilon2.1_idle_01.mtn
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 ...ts/Epsilon2.1/motions/Epsilon2.1_m_01.mtn → assets/Epsilon2.1/mtn/Epsilon2.1_m_01.mtn
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 ...ts/Epsilon2.1/motions/Epsilon2.1_m_02.mtn → assets/Epsilon2.1/mtn/Epsilon2.1_m_02.mtn
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 ...ts/Epsilon2.1/motions/Epsilon2.1_m_03.mtn → assets/Epsilon2.1/mtn/Epsilon2.1_m_03.mtn
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 ...ts/Epsilon2.1/motions/Epsilon2.1_m_04.mtn → assets/Epsilon2.1/mtn/Epsilon2.1_m_04.mtn
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 ...ts/Epsilon2.1/motions/Epsilon2.1_m_05.mtn → assets/Epsilon2.1/mtn/Epsilon2.1_m_05.mtn
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 ...ts/Epsilon2.1/motions/Epsilon2.1_m_06.mtn → assets/Epsilon2.1/mtn/Epsilon2.1_m_06.mtn
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 ...ts/Epsilon2.1/motions/Epsilon2.1_m_07.mtn → assets/Epsilon2.1/mtn/Epsilon2.1_m_07.mtn
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 ...ts/Epsilon2.1/motions/Epsilon2.1_m_08.mtn → assets/Epsilon2.1/mtn/Epsilon2.1_m_08.mtn
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 ...Epsilon2.1/motions/Epsilon2.1_m_sp_01.mtn → assets/Epsilon2.1/mtn/Epsilon2.1_m_sp_01.mtn
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 ...Epsilon2.1/motions/Epsilon2.1_m_sp_02.mtn → assets/Epsilon2.1/mtn/Epsilon2.1_m_sp_02.mtn
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 ...Epsilon2.1/motions/Epsilon2.1_m_sp_03.mtn → assets/Epsilon2.1/mtn/Epsilon2.1_m_sp_03.mtn
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 ...Epsilon2.1/motions/Epsilon2.1_m_sp_04.mtn → assets/Epsilon2.1/mtn/Epsilon2.1_m_sp_04.mtn
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 ...Epsilon2.1/motions/Epsilon2.1_m_sp_05.mtn → assets/Epsilon2.1/mtn/Epsilon2.1_m_sp_05.mtn
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 ...psilon2.1/motions/Epsilon2.1_shake_01.mtn → ...ts/Epsilon2.1/mtn/Epsilon2.1_shake_01.mtn
100755 → 100644
View file
Open in desktop
File renamed without changes.
25 changes: 25 additions & 0 deletions assets/Gantzert_Felixander/Gantzert_Felixander.model.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"version":"Sample 1.0.0",
"model":"moc/Gantzert_Felixander.moc",
"textures":[
"moc/Gantzert_Felixander.2048/texture_00.png",
"moc/Gantzert_Felixander.2048/texture_01.png",
"moc/Gantzert_Felixander.2048/texture_02.png",
"moc/Gantzert_Felixander.2048/texture_03.png",
"moc/Gantzert_Felixander.2048/texture_04.png",
"moc/Gantzert_Felixander.2048/texture_05.png",
"moc/Gantzert_Felixander.2048/texture_06.png"
],
"motions":{
"idle":[
{"file":"mtn/A_00_idle.mtn"}
],
"":[
{"file":"mtn/A_02.mtn"},
{"file":"mtn/A_03.mtn"},
{"file":"mtn/A_04.mtn"},
{"file":"mtn/A_05.mtn"},
{"file":"mtn/A_01.mtn"}
]
}
}
0 ..._Felixander/moc/model.2048/texture_00.png → ...c/Gantzert_Felixander.2048/texture_00.png
100755 → 100644
View file
Open in desktop
File renamed without changes
0 ..._Felixander/moc/model.2048/texture_01.png → ...c/Gantzert_Felixander.2048/texture_01.png
100755 → 100644
View file
Open in desktop
File renamed without changes
0 ..._Felixander/moc/model.2048/texture_02.png → ...c/Gantzert_Felixander.2048/texture_02.png
100755 → 100644
View file
Open in desktop
File renamed without changes
0 ..._Felixander/moc/model.2048/texture_03.png → ...c/Gantzert_Felixander.2048/texture_03.png
100755 → 100644
View file
Open in desktop
File renamed without changes
0 ..._Felixander/moc/model.2048/texture_04.png → ...c/Gantzert_Felixander.2048/texture_04.png
100755 → 100644
View file
Open in desktop
File renamed without changes
0 ..._Felixander/moc/model.2048/texture_05.png → ...c/Gantzert_Felixander.2048/texture_05.png
100755 → 100644
View file
Open in desktop
File renamed without changes
0 ..._Felixander/moc/model.2048/texture_06.png → ...c/Gantzert_Felixander.2048/texture_06.png
100755 → 100644
View file
Open in desktop
File renamed without changes
0 assets/Gantzert_Felixander/moc/model.moc → ...rt_Felixander/moc/Gantzert_Felixander.moc
100755 → 100644
View file
Open in desktop
File renamed without changes.
25 changes: 0 additions & 25 deletions assets/Gantzert_Felixander/moc/model.json
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions assets/Gantzert_Felixander/model.json
View file
Open in desktop

This file was deleted.

0 ...s/Unitychan/unitychan.2048/texture_00.png → ...itychan/moc/unitychan.2048/texture_00.png
View file
Open in desktop
File renamed without changes
0 assets/Unitychan/unitychan.moc → assets/Unitychan/moc/unitychan.moc
View file
Open in desktop
File renamed without changes.
0 assets/Unitychan/motions/idle_01.mtn → assets/Unitychan/mtn/idle_01.mtn
View file
Open in desktop
File renamed without changes.
0 assets/Unitychan/motions/idle_02.mtn → assets/Unitychan/mtn/idle_02.mtn
View file
Open in desktop
File renamed without changes.
0 assets/Unitychan/motions/m_01.mtn → assets/Unitychan/mtn/m_01.mtn
View file
Open in desktop
File renamed without changes.
0 assets/Unitychan/motions/m_02.mtn → assets/Unitychan/mtn/m_02.mtn
View file
Open in desktop
File renamed without changes.
0 assets/Unitychan/motions/m_03.mtn → assets/Unitychan/mtn/m_03.mtn
View file
Open in desktop
File renamed without changes.
0 assets/Unitychan/motions/m_04.mtn → assets/Unitychan/mtn/m_04.mtn
View file
Open in desktop
File renamed without changes.
0 assets/Unitychan/motions/m_05.mtn → assets/Unitychan/mtn/m_05.mtn
View file
Open in desktop
File renamed without changes.
0 assets/Unitychan/motions/m_06.mtn → assets/Unitychan/mtn/m_06.mtn
View file
Open in desktop
File renamed without changes.
0 assets/Unitychan/motions/m_07.mtn → assets/Unitychan/mtn/m_07.mtn
View file
Open in desktop
File renamed without changes.
0 assets/Unitychan/motions/m_08.mtn → assets/Unitychan/mtn/m_08.mtn
View file
Open in desktop
File renamed without changes.
0 assets/Unitychan/motions/m_09.mtn → assets/Unitychan/mtn/m_09.mtn
View file
Open in desktop
File renamed without changes.
0 assets/Unitychan/motions/m_10.mtn → assets/Unitychan/mtn/m_10.mtn
View file
Open in desktop
File renamed without changes.
0 assets/Unitychan/motions/m_11.mtn → assets/Unitychan/mtn/m_11.mtn
View file
Open in desktop
File renamed without changes.
0 assets/Unitychan/motions/m_12.mtn → assets/Unitychan/mtn/m_12.mtn
View file
Open in desktop
File renamed without changes.
0 assets/Unitychan/motions/m_13.mtn → assets/Unitychan/mtn/m_13.mtn
View file
Open in desktop
File renamed without changes.
0 assets/Unitychan/motions/m_14.mtn → assets/Unitychan/mtn/m_14.mtn
View file
Open in desktop
File renamed without changes.
36 changes: 18 additions & 18 deletions assets/Unitychan/unitychan.model.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
{
"version":"Sample 1.0.0",
"model":"unitychan.moc",
"model":"moc/unitychan.moc",
"textures":[
"unitychan.2048/texture_00.png"
"moc/unitychan.2048/texture_00.png"
],
"motions":{
"":[
{"file":"motions/m_01.mtn"},
{"file":"motions/m_02.mtn"},
{"file":"motions/m_03.mtn"},
{"file":"motions/m_04.mtn"},
{"file":"motions/m_05.mtn"},
{"file":"motions/m_06.mtn"},
{"file":"motions/m_07.mtn"},
{"file":"motions/m_08.mtn"},
{"file":"motions/m_09.mtn"},
{"file":"motions/m_10.mtn"},
{"file":"motions/m_11.mtn"},
{"file":"motions/m_12.mtn"},
{"file":"motions/m_13.mtn"},
{"file":"motions/m_14.mtn"}
{"file":"mtn/m_01.mtn"},
{"file":"mtn/m_02.mtn"},
{"file":"mtn/m_03.mtn"},
{"file":"mtn/m_04.mtn"},
{"file":"mtn/m_05.mtn"},
{"file":"mtn/m_06.mtn"},
{"file":"mtn/m_07.mtn"},
{"file":"mtn/m_08.mtn"},
{"file":"mtn/m_09.mtn"},
{"file":"mtn/m_10.mtn"},
{"file":"mtn/m_11.mtn"},
{"file":"mtn/m_12.mtn"},
{"file":"mtn/m_13.mtn"},
{"file":"mtn/m_14.mtn"}
],
"idle":[
{"file":"motions/idle_01.mtn"},
{"file":"motions/idle_02.mtn"}
{"file":"mtn/idle_01.mtn"},
{"file":"mtn/idle_02.mtn"}
]
},
"physics":"unitychan.physics.json"
Expand Down
66 changes: 0 additions & 66 deletions assets/haru/haru.model.json
View file
Open in desktop

This file was deleted.

48 changes: 0 additions & 48 deletions assets/haru/haru_01.model.json
View file
Open in desktop

This file was deleted.

47 changes: 0 additions & 47 deletions assets/haru/haru_02.model.json
View file
Open in desktop

This file was deleted.

0 assets/haru/expressions/f01.exp.json → assets/haru01/exp/f01.exp.json
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 assets/haru/expressions/f02.exp.json → assets/haru01/exp/f02.exp.json
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 assets/haru/expressions/f03.exp.json → assets/haru01/exp/f03.exp.json
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 assets/haru/expressions/f04.exp.json → assets/haru01/exp/f04.exp.json
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 assets/haru/expressions/f05.exp.json → assets/haru01/exp/f05.exp.json
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 assets/haru/expressions/f06.exp.json → assets/haru01/exp/f06.exp.json
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 assets/haru/expressions/f07.exp.json → assets/haru01/exp/f07.exp.json
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 assets/haru/expressions/f08.exp.json → assets/haru01/exp/f08.exp.json
100755 → 100644
View file
Open in desktop
File renamed without changes.
Loading