Skip to content

Commit

Permalink
Merge pull request #46 from sknjpn/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
sknjpn authored Jan 27, 2020
2 parents a18e33d + cdf3ca3 commit 18ac183
Show file tree
Hide file tree
Showing 100 changed files with 1,715 additions and 1,076 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -273,3 +273,4 @@ Siv3D_App
.DS_Store
SyLife.app/
config.ini
SyLife.xcodeproj/project.xcworkspace/xcuserdata/sknjpn.xcuserdatad/UserInterfaceState.xcuserstate
5 changes: 5 additions & 0 deletions App/Resource.rc
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ Resource(engine/soundfont/GMGSx.sf2.zstdcmp)
//////////////////////////////////////////////////////


Resource(resources/music/���݂��܂̂�肩��.mp3)
Resource(resources/music/���ށB.mp3)
Resource(resources/music/�V�̂����͂�.mp3)
Resource(resources/music/�^���T��.mp3)
Resource(resources/music/���炬�Ɣ�����.mp3)

/*
//
Expand Down
32 changes: 32 additions & 0 deletions App/resources/assets/cells/asset_0.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"type": "CellAsset",
"name": "asset_0",
"nameJP": "コナヒゲムシ",
"parts": [
{
"asset": "asset_1",
"position": "(-2.20536, 6.16871)",
"rotation": 0.0
},
{
"asset": "Small_Nucleus",
"position": "(-2.20536, 6.16871)",
"rotation": 0.0
},
{
"asset": "Plumagenase",
"position": "(-15.70536, -9.58129)",
"rotation": 0.0
},
{
"asset": "Plumagenase",
"position": "(2.29464, -16.33129)",
"rotation": 0.0
},
{
"asset": "Spinagenase",
"position": "(15.54464, 2.66871)",
"rotation": 0.0
}
]
}
66 changes: 66 additions & 0 deletions App/resources/assets/cells/asset_1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
{
"type": "PartAsset_Body",
"name": "asset_1",
"nameJP": "",
"mass": 31.237792587280276,
"layers": [
{
"color": "(35, 255, 15, 255)",
"polygon": {
"outer": [
"(-3.3955, 29.69793)",
"(-8, 28.41025)",
"(-11.32107, 26.07107)",
"(-22.66025, 10.5)",
"(-28.15926, -3.41181)",
"(-28.65926, -19.83819)",
"(-25.32107, -27.07107)",
"(-17.82107, -34.57107)",
"(-14, -37.16025)",
"(-8.5, -38.75)",
"(-4.41181, -38.40926)",
"(9, -34.91025)",
"(20.07107, -25.07107)",
"(28.41025, -11.5)",
"(31.40926, 1.16181)",
"(30.40926, 9.33819)",
"(29.41025, 11.75)",
"(26.56786, 14.78269)",
"(24.91025, 19.75)",
"(18.5, 25.91025)",
"(7.58819, 30.65926)",
"(0.5, 31)"
],
"holes": []
}
},
{
"color": "(255, 231, 4, 255)",
"polygon": {
"outer": [
"(-13.91302, -30.46405)",
"(-9, -33.41025)",
"(-0.5, -34.75)",
"(2.50875, -34.16972)",
"(16.07107, -23.57107)",
"(22.91025, -13.5)",
"(28.65926, 0.41181)",
"(29, 4.25)",
"(28.00713, 7.95546)",
"(21.71469, 14.80368)",
"(6.58819, 20.15926)",
"(-1.58819, 19.90926)",
"(-14.66101, 10.90304)",
"(-23.90926, -8.41181)",
"(-22.68573, -22.12784)",
"(-19.57107, -27.07107)"
],
"holes": []
}
}
],
"material": {
"element": 31.237792587280276,
"proteins": []
}
}
57 changes: 0 additions & 57 deletions App/resources/assets/cells/asset_10.json

This file was deleted.

38 changes: 0 additions & 38 deletions App/resources/assets/cells/asset_11.json

This file was deleted.

37 changes: 37 additions & 0 deletions App/resources/assets/cells/asset_12.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"type": "CellAsset",
"name": "asset_12",
"nameJP": "ブレファリズマ",
"parts": [
{
"asset": "asset_13",
"position": "(0.81796, 12.87518)",
"rotation": 0.0
},
{
"asset": "Small_Nucleus",
"position": "(0.81796, 12.87518)",
"rotation": 0.0
},
{
"asset": "Needle",
"position": "(-0.68204, -8.62482)",
"rotation": 0.0
},
{
"asset": "Small_Wing(left)",
"position": "(-11.68204, -4.87482)",
"rotation": 0.0
},
{
"asset": "Small_Wing(right)",
"position": "(10.31796, -6.87482)",
"rotation": 0.0
},
{
"asset": "Spinagenase",
"position": "(-0.43204, 5.87518)",
"rotation": 0.0
}
]
}
83 changes: 83 additions & 0 deletions App/resources/assets/cells/asset_13.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
{
"type": "PartAsset_Body",
"name": "asset_13",
"nameJP": "",
"mass": 19.30565588474274,
"layers": [
{
"color": "(0, 105, 255, 255)",
"polygon": {
"outer": [
"(-17.60392, -17.28245)",
"(-15.32107, -20.82107)",
"(-12.22214, -22.94427)",
"(-6.32471, -25.00977)",
"(5.58819, -25.65926)",
"(10, -24.16025)",
"(12.82107, -22.07107)",
"(15.66025, -18.5)",
"(19.40926, -11.58819)",
"(20.25, 4.75)",
"(18.90926, 16.83819)",
"(14.66025, 25.25)",
"(9, 30.91025)",
"(6.08819, 32.15926)",
"(2.25, 32.5)",
"(-5, 31.16025)",
"(-8.17565, 28.85896)",
"(-11.27521, 25.22246)",
"(-18.91025, 11.5)",
"(-21, 2.5)",
"(-20.40926, -10.08819)"
],
"holes": []
}
},
{
"color": "(255, 158, 195, 255)",
"polygon": {
"outer": [
"(10.67337, -2.16382)",
"(8.46114, -8.9375)",
"(10.82441, -10.7509)",
"(14.6875, -10.53886)",
"(17.375, -2.5)",
"(15.72593, 19.38233)",
"(10.84359, 24.84359)",
"(7.75, 26.125)",
"(5.5625, 25.53886)",
"(3.96114, 23.9375)",
"(4.11967, 21.17051)",
"(10.97593, 14.63233)",
"(11.625, 0.5)"
],
"holes": []
}
},
{
"color": "(255, 168, 193, 255)",
"polygon": {
"outer": [
"(1.62883, 21.29221)",
"(2.375, 23)",
"(1.78886, 25.1875)",
"(-0.86767, 27.22593)",
"(-3.13233, 27.22593)",
"(-8.92, 22.37089)",
"(-17.875, 6.25)",
"(-15.38233, -9.47593)",
"(-12.0625, -9.03886)",
"(-10.12396, -4.4782)",
"(-11.375, 1.5)",
"(-10.0443, 6.613)",
"(-2.09359, 20.09359)"
],
"holes": []
}
}
],
"material": {
"element": 19.30565588474274,
"proteins": []
}
}
Loading

0 comments on commit 18ac183

Please sign in to comment.