Skip to content

Commit 18ac183

Browse files
sknjpnsknjpn
authored
Merge pull request #46 from sknjpn/develop
Develop
2 parents a18e33d + cdf3ca3 commit 18ac183

File tree

100 files changed

+1715
-1076
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+1715
-1076
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,3 +273,4 @@ Siv3D_App
273273
.DS_Store
274274
SyLife.app/
275275
config.ini
276+
SyLife.xcodeproj/project.xcworkspace/xcuserdata/sknjpn.xcuserdatad/UserInterfaceState.xcuserstate

‎App/Resource.rc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@ Resource(engine/soundfont/GMGSx.sf2.zstdcmp)
5858
//////////////////////////////////////////////////////
5959

6060

61+
Resource(resources/music/���݂��܂̂�肩��.mp3)
62+
Resource(resources/music/���ށB.mp3)
63+
Resource(resources/music/�V�̂����͂�.mp3)
64+
Resource(resources/music/�^���T��.mp3)
65+
Resource(resources/music/���炬�Ɣ�����.mp3)
6166

6267
/*
6368
//

‎App/resources/assets/cells/asset_0.json‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"type": "CellAsset",
3+
"name": "asset_0",
4+
"nameJP": "コナヒゲムシ",
5+
"parts": [
6+
{
7+
"asset": "asset_1",
8+
"position": "(-2.20536, 6.16871)",
9+
"rotation": 0.0
10+
},
11+
{
12+
"asset": "Small_Nucleus",
13+
"position": "(-2.20536, 6.16871)",
14+
"rotation": 0.0
15+
},
16+
{
17+
"asset": "Plumagenase",
18+
"position": "(-15.70536, -9.58129)",
19+
"rotation": 0.0
20+
},
21+
{
22+
"asset": "Plumagenase",
23+
"position": "(2.29464, -16.33129)",
24+
"rotation": 0.0
25+
},
26+
{
27+
"asset": "Spinagenase",
28+
"position": "(15.54464, 2.66871)",
29+
"rotation": 0.0
30+
}
31+
]
32+
}

‎App/resources/assets/cells/asset_1.json‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
{
2+
"type": "PartAsset_Body",
3+
"name": "asset_1",
4+
"nameJP": "",
5+
"mass": 31.237792587280276,
6+
"layers": [
7+
{
8+
"color": "(35, 255, 15, 255)",
9+
"polygon": {
10+
"outer": [
11+
"(-3.3955, 29.69793)",
12+
"(-8, 28.41025)",
13+
"(-11.32107, 26.07107)",
14+
"(-22.66025, 10.5)",
15+
"(-28.15926, -3.41181)",
16+
"(-28.65926, -19.83819)",
17+
"(-25.32107, -27.07107)",
18+
"(-17.82107, -34.57107)",
19+
"(-14, -37.16025)",
20+
"(-8.5, -38.75)",
21+
"(-4.41181, -38.40926)",
22+
"(9, -34.91025)",
23+
"(20.07107, -25.07107)",
24+
"(28.41025, -11.5)",
25+
"(31.40926, 1.16181)",
26+
"(30.40926, 9.33819)",
27+
"(29.41025, 11.75)",
28+
"(26.56786, 14.78269)",
29+
"(24.91025, 19.75)",
30+
"(18.5, 25.91025)",
31+
"(7.58819, 30.65926)",
32+
"(0.5, 31)"
33+
],
34+
"holes": []
35+
}
36+
},
37+
{
38+
"color": "(255, 231, 4, 255)",
39+
"polygon": {
40+
"outer": [
41+
"(-13.91302, -30.46405)",
42+
"(-9, -33.41025)",
43+
"(-0.5, -34.75)",
44+
"(2.50875, -34.16972)",
45+
"(16.07107, -23.57107)",
46+
"(22.91025, -13.5)",
47+
"(28.65926, 0.41181)",
48+
"(29, 4.25)",
49+
"(28.00713, 7.95546)",
50+
"(21.71469, 14.80368)",
51+
"(6.58819, 20.15926)",
52+
"(-1.58819, 19.90926)",
53+
"(-14.66101, 10.90304)",
54+
"(-23.90926, -8.41181)",
55+
"(-22.68573, -22.12784)",
56+
"(-19.57107, -27.07107)"
57+
],
58+
"holes": []
59+
}
60+
}
61+
],
62+
"material": {
63+
"element": 31.237792587280276,
64+
"proteins": []
65+
}
66+
}

‎App/resources/assets/cells/asset_10.json‎

Lines changed: 0 additions & 57 deletions
This file was deleted.

‎App/resources/assets/cells/asset_11.json‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎App/resources/assets/cells/asset_12.json‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"type": "CellAsset",
3+
"name": "asset_12",
4+
"nameJP": "ブレファリズマ",
5+
"parts": [
6+
{
7+
"asset": "asset_13",
8+
"position": "(0.81796, 12.87518)",
9+
"rotation": 0.0
10+
},
11+
{
12+
"asset": "Small_Nucleus",
13+
"position": "(0.81796, 12.87518)",
14+
"rotation": 0.0
15+
},
16+
{
17+
"asset": "Needle",
18+
"position": "(-0.68204, -8.62482)",
19+
"rotation": 0.0
20+
},
21+
{
22+
"asset": "Small_Wing(left)",
23+
"position": "(-11.68204, -4.87482)",
24+
"rotation": 0.0
25+
},
26+
{
27+
"asset": "Small_Wing(right)",
28+
"position": "(10.31796, -6.87482)",
29+
"rotation": 0.0
30+
},
31+
{
32+
"asset": "Spinagenase",
33+
"position": "(-0.43204, 5.87518)",
34+
"rotation": 0.0
35+
}
36+
]
37+
}

‎App/resources/assets/cells/asset_13.json‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
{
2+
"type": "PartAsset_Body",
3+
"name": "asset_13",
4+
"nameJP": "",
5+
"mass": 19.30565588474274,
6+
"layers": [
7+
{
8+
"color": "(0, 105, 255, 255)",
9+
"polygon": {
10+
"outer": [
11+
"(-17.60392, -17.28245)",
12+
"(-15.32107, -20.82107)",
13+
"(-12.22214, -22.94427)",
14+
"(-6.32471, -25.00977)",
15+
"(5.58819, -25.65926)",
16+
"(10, -24.16025)",
17+
"(12.82107, -22.07107)",
18+
"(15.66025, -18.5)",
19+
"(19.40926, -11.58819)",
20+
"(20.25, 4.75)",
21+
"(18.90926, 16.83819)",
22+
"(14.66025, 25.25)",
23+
"(9, 30.91025)",
24+
"(6.08819, 32.15926)",
25+
"(2.25, 32.5)",
26+
"(-5, 31.16025)",
27+
"(-8.17565, 28.85896)",
28+
"(-11.27521, 25.22246)",
29+
"(-18.91025, 11.5)",
30+
"(-21, 2.5)",
31+
"(-20.40926, -10.08819)"
32+
],
33+
"holes": []
34+
}
35+
},
36+
{
37+
"color": "(255, 158, 195, 255)",
38+
"polygon": {
39+
"outer": [
40+
"(10.67337, -2.16382)",
41+
"(8.46114, -8.9375)",
42+
"(10.82441, -10.7509)",
43+
"(14.6875, -10.53886)",
44+
"(17.375, -2.5)",
45+
"(15.72593, 19.38233)",
46+
"(10.84359, 24.84359)",
47+
"(7.75, 26.125)",
48+
"(5.5625, 25.53886)",
49+
"(3.96114, 23.9375)",
50+
"(4.11967, 21.17051)",
51+
"(10.97593, 14.63233)",
52+
"(11.625, 0.5)"
53+
],
54+
"holes": []
55+
}
56+
},
57+
{
58+
"color": "(255, 168, 193, 255)",
59+
"polygon": {
60+
"outer": [
61+
"(1.62883, 21.29221)",
62+
"(2.375, 23)",
63+
"(1.78886, 25.1875)",
64+
"(-0.86767, 27.22593)",
65+
"(-3.13233, 27.22593)",
66+
"(-8.92, 22.37089)",
67+
"(-17.875, 6.25)",
68+
"(-15.38233, -9.47593)",
69+
"(-12.0625, -9.03886)",
70+
"(-10.12396, -4.4782)",
71+
"(-11.375, 1.5)",
72+
"(-10.0443, 6.613)",
73+
"(-2.09359, 20.09359)"
74+
],
75+
"holes": []
76+
}
77+
}
78+
],
79+
"material": {
80+
"element": 19.30565588474274,
81+
"proteins": []
82+
}
83+
}

0 commit comments

Comments
 (0)