优化牛头王动画
This commit is contained in:
Atsuishio
Light_Quanta
parent
4183590fd4
commit
e9558aafee
8 changed files with 1115 additions and 651 deletions
|
|
@ -140,7 +140,7 @@ public class Ntw20Model extends GeoModel<Ntw20Item> {
|
||||||
GeoBone camera = getAnimationProcessor().getBone("camera");
|
GeoBone camera = getAnimationProcessor().getBone("camera");
|
||||||
GeoBone main = getAnimationProcessor().getBone("0");
|
GeoBone main = getAnimationProcessor().getBone("0");
|
||||||
|
|
||||||
float numR = (float) (1 - 0.92 * zt);
|
float numR = (float) (1 - 0.98 * zt);
|
||||||
float numP = (float) (1 - 0.88 * zt);
|
float numP = (float) (1 - 0.88 * zt);
|
||||||
|
|
||||||
if (data.reload.time() > 0 || data.bolt.actionTimer.get() > 0) {
|
if (data.reload.time() > 0 || data.bolt.actionTimer.get() > 0) {
|
||||||
|
|
|
||||||
|
|
@ -1109,7 +1109,7 @@ public class ClientEventHandler {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isMoving() && !entity.isSprinting()) {
|
if (isMoving() && !entity.isSprinting() && firePosTimer == 0) {
|
||||||
moveYTime += 1.2 * onGround * times * moveSpeed;
|
moveYTime += 1.2 * onGround * times * moveSpeed;
|
||||||
moveXTime += 1.2 * onGround * times * moveSpeed;
|
moveXTime += 1.2 * onGround * times * moveSpeed;
|
||||||
moveFadeTime = Mth.lerp(0.13 * times, moveFadeTime, 1);
|
moveFadeTime = Mth.lerp(0.13 * times, moveFadeTime, 1);
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -2315,114 +2315,6 @@
|
||||||
"down": {"uv": [59, 42.25], "uv_size": [2, -1.25]}
|
"down": {"uv": [59, 42.25], "uv_size": [2, -1.25]}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"origin": [2.26572, 4.11063, -12.88141],
|
|
||||||
"size": [0.565, 0.5, 0.565],
|
|
||||||
"pivot": [2.54822, 4.48563, -12.59891],
|
|
||||||
"rotation": [0, 0, 90],
|
|
||||||
"uv": {
|
|
||||||
"north": {"uv": [71, 32], "uv_size": [0.5, 0.5]},
|
|
||||||
"east": {"uv": [33, 71], "uv_size": [0.5, 0.5]},
|
|
||||||
"south": {"uv": [71, 33], "uv_size": [0.5, 0.5]},
|
|
||||||
"west": {"uv": [34, 71], "uv_size": [0.5, 0.5]}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"origin": [2.3147, 4.35163, -12.88141],
|
|
||||||
"size": [0.565, 0.6, 0.565],
|
|
||||||
"pivot": [2.5972, 4.52663, -12.59891],
|
|
||||||
"rotation": [0, 0, 45],
|
|
||||||
"uv": {
|
|
||||||
"north": {"uv": [71, 34], "uv_size": [0.5, 0.5]},
|
|
||||||
"east": {"uv": [35, 71], "uv_size": [0.5, 0.5]},
|
|
||||||
"south": {"uv": [71, 35], "uv_size": [0.5, 0.5]},
|
|
||||||
"west": {"uv": [71, 36], "uv_size": [0.5, 0.5]}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"origin": [2.49148, 10.92638, -12.88141],
|
|
||||||
"size": [0.565, 0.6, 0.565],
|
|
||||||
"pivot": [2.77398, 11.10138, -12.59891],
|
|
||||||
"rotation": [0, 0, -45],
|
|
||||||
"uv": {
|
|
||||||
"north": {"uv": [71, 37], "uv_size": [0.5, 0.5]},
|
|
||||||
"east": {"uv": [38, 71], "uv_size": [0.5, 0.5]},
|
|
||||||
"south": {"uv": [39, 71], "uv_size": [0.5, 0.5]},
|
|
||||||
"west": {"uv": [40, 71], "uv_size": [0.5, 0.5]}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"origin": [-0.2825, 8.64377, -12.88141],
|
|
||||||
"size": [0.565, 5.35078, 0.565],
|
|
||||||
"pivot": [0, 11.31916, -12.59891],
|
|
||||||
"rotation": [0, 0, -90],
|
|
||||||
"uv": {
|
|
||||||
"north": {"uv": [16, 59], "uv_size": [0.5, 5.25]},
|
|
||||||
"east": {"uv": [17, 59], "uv_size": [0.5, 5.25]},
|
|
||||||
"south": {"uv": [18, 59], "uv_size": [0.5, 5.25]},
|
|
||||||
"west": {"uv": [19, 59], "uv_size": [0.5, 5.25]}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"origin": [2.53248, 4.62739, -12.88141],
|
|
||||||
"size": [0.565, 6.55, 0.565],
|
|
||||||
"pivot": [2.81498, 7.90239, -12.59891],
|
|
||||||
"rotation": [0, 0, 0],
|
|
||||||
"uv": {
|
|
||||||
"north": {"uv": [46, 57], "uv_size": [0.5, 6.5]},
|
|
||||||
"east": {"uv": [47, 57], "uv_size": [0.5, 6.5]},
|
|
||||||
"south": {"uv": [57, 51], "uv_size": [0.5, 6.5]},
|
|
||||||
"west": {"uv": [58, 22], "uv_size": [0.5, 6.5]}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"origin": [-2.83072, 4.11063, -12.88141],
|
|
||||||
"size": [0.565, 0.5, 0.565],
|
|
||||||
"pivot": [-2.54822, 4.48563, -12.59891],
|
|
||||||
"rotation": [0, 0, -90],
|
|
||||||
"uv": {
|
|
||||||
"north": {"uv": [41, 71], "uv_size": [0.5, 0.5]},
|
|
||||||
"east": {"uv": [42, 71], "uv_size": [0.5, 0.5]},
|
|
||||||
"south": {"uv": [43, 71], "uv_size": [0.5, 0.5]},
|
|
||||||
"west": {"uv": [44, 71], "uv_size": [0.5, 0.5]}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"origin": [-2.8797, 4.35163, -12.88141],
|
|
||||||
"size": [0.565, 0.6, 0.565],
|
|
||||||
"pivot": [-2.5972, 4.52663, -12.59891],
|
|
||||||
"rotation": [0, 0, -45],
|
|
||||||
"uv": {
|
|
||||||
"north": {"uv": [45, 71], "uv_size": [0.5, 0.5]},
|
|
||||||
"east": {"uv": [71, 45], "uv_size": [0.5, 0.5]},
|
|
||||||
"south": {"uv": [46, 71], "uv_size": [0.5, 0.5]},
|
|
||||||
"west": {"uv": [71, 46], "uv_size": [0.5, 0.5]}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"origin": [-3.09748, 4.62739, -12.88141],
|
|
||||||
"size": [0.565, 6.55, 0.565],
|
|
||||||
"pivot": [-2.81498, 7.90239, -12.59891],
|
|
||||||
"rotation": [0, 0, 0],
|
|
||||||
"uv": {
|
|
||||||
"north": {"uv": [58, 29], "uv_size": [0.5, 6.5]},
|
|
||||||
"east": {"uv": [58, 51], "uv_size": [0.5, 6.5]},
|
|
||||||
"south": {"uv": [52, 58], "uv_size": [0.5, 6.5]},
|
|
||||||
"west": {"uv": [55, 58], "uv_size": [0.5, 6.5]}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"origin": [-3.05648, 10.92638, -12.88141],
|
|
||||||
"size": [0.565, 0.6, 0.565],
|
|
||||||
"pivot": [-2.77398, 11.10138, -12.59891],
|
|
||||||
"rotation": [0, 0, 45],
|
|
||||||
"uv": {
|
|
||||||
"north": {"uv": [47, 71], "uv_size": [0.5, 0.5]},
|
|
||||||
"east": {"uv": [48, 71], "uv_size": [0.5, 0.5]},
|
|
||||||
"south": {"uv": [71, 48], "uv_size": [0.5, 0.5]},
|
|
||||||
"west": {"uv": [49, 71], "uv_size": [0.5, 0.5]}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"origin": [-0.4325, 5.67413, -13.18141],
|
"origin": [-0.4325, 5.67413, -13.18141],
|
||||||
"size": [1.965, 0.13471, 1.165],
|
"size": [1.965, 0.13471, 1.165],
|
||||||
|
|
@ -2537,6 +2429,121 @@
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "handle",
|
||||||
|
"parent": "0",
|
||||||
|
"pivot": [-2.54822, 4.52563, -12.59891],
|
||||||
|
"cubes": [
|
||||||
|
{
|
||||||
|
"origin": [2.26572, 4.11063, -12.88141],
|
||||||
|
"size": [0.565, 0.5, 0.565],
|
||||||
|
"pivot": [2.54822, 4.48563, -12.59891],
|
||||||
|
"rotation": [0, 0, 90],
|
||||||
|
"uv": {
|
||||||
|
"north": {"uv": [71, 32], "uv_size": [0.5, 0.5]},
|
||||||
|
"east": {"uv": [33, 71], "uv_size": [0.5, 0.5]},
|
||||||
|
"south": {"uv": [71, 33], "uv_size": [0.5, 0.5]},
|
||||||
|
"west": {"uv": [34, 71], "uv_size": [0.5, 0.5]}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"origin": [2.3147, 4.35163, -12.88141],
|
||||||
|
"size": [0.565, 0.6, 0.565],
|
||||||
|
"pivot": [2.5972, 4.52663, -12.59891],
|
||||||
|
"rotation": [0, 0, 45],
|
||||||
|
"uv": {
|
||||||
|
"north": {"uv": [71, 34], "uv_size": [0.5, 0.5]},
|
||||||
|
"east": {"uv": [35, 71], "uv_size": [0.5, 0.5]},
|
||||||
|
"south": {"uv": [71, 35], "uv_size": [0.5, 0.5]},
|
||||||
|
"west": {"uv": [71, 36], "uv_size": [0.5, 0.5]}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"origin": [2.53248, 4.62739, -12.88141],
|
||||||
|
"size": [0.565, 6.55, 0.565],
|
||||||
|
"pivot": [2.81498, 7.90239, -12.59891],
|
||||||
|
"rotation": [0, 0, 0],
|
||||||
|
"uv": {
|
||||||
|
"north": {"uv": [46, 57], "uv_size": [0.5, 6.5]},
|
||||||
|
"east": {"uv": [47, 57], "uv_size": [0.5, 6.5]},
|
||||||
|
"south": {"uv": [57, 51], "uv_size": [0.5, 6.5]},
|
||||||
|
"west": {"uv": [58, 22], "uv_size": [0.5, 6.5]}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"origin": [2.49148, 10.92638, -12.88141],
|
||||||
|
"size": [0.565, 0.6, 0.565],
|
||||||
|
"pivot": [2.77398, 11.10138, -12.59891],
|
||||||
|
"rotation": [0, 0, -45],
|
||||||
|
"uv": {
|
||||||
|
"north": {"uv": [71, 37], "uv_size": [0.5, 0.5]},
|
||||||
|
"east": {"uv": [38, 71], "uv_size": [0.5, 0.5]},
|
||||||
|
"south": {"uv": [39, 71], "uv_size": [0.5, 0.5]},
|
||||||
|
"west": {"uv": [40, 71], "uv_size": [0.5, 0.5]}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"origin": [-0.2825, 8.64377, -12.88141],
|
||||||
|
"size": [0.565, 5.35078, 0.565],
|
||||||
|
"pivot": [0, 11.31916, -12.59891],
|
||||||
|
"rotation": [0, 0, -90],
|
||||||
|
"uv": {
|
||||||
|
"north": {"uv": [16, 59], "uv_size": [0.5, 5.25]},
|
||||||
|
"east": {"uv": [17, 59], "uv_size": [0.5, 5.25]},
|
||||||
|
"south": {"uv": [18, 59], "uv_size": [0.5, 5.25]},
|
||||||
|
"west": {"uv": [19, 59], "uv_size": [0.5, 5.25]}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"origin": [-3.09748, 4.62739, -12.88141],
|
||||||
|
"size": [0.565, 6.55, 0.565],
|
||||||
|
"pivot": [-2.81498, 7.90239, -12.59891],
|
||||||
|
"rotation": [0, 0, 0],
|
||||||
|
"uv": {
|
||||||
|
"north": {"uv": [58, 29], "uv_size": [0.5, 6.5]},
|
||||||
|
"east": {"uv": [58, 51], "uv_size": [0.5, 6.5]},
|
||||||
|
"south": {"uv": [52, 58], "uv_size": [0.5, 6.5]},
|
||||||
|
"west": {"uv": [55, 58], "uv_size": [0.5, 6.5]}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"origin": [-3.05648, 10.92638, -12.88141],
|
||||||
|
"size": [0.565, 0.6, 0.565],
|
||||||
|
"pivot": [-2.77398, 11.10138, -12.59891],
|
||||||
|
"rotation": [0, 0, 45],
|
||||||
|
"uv": {
|
||||||
|
"north": {"uv": [47, 71], "uv_size": [0.5, 0.5]},
|
||||||
|
"east": {"uv": [48, 71], "uv_size": [0.5, 0.5]},
|
||||||
|
"south": {"uv": [71, 48], "uv_size": [0.5, 0.5]},
|
||||||
|
"west": {"uv": [49, 71], "uv_size": [0.5, 0.5]}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"origin": [-2.8797, 4.35163, -12.88141],
|
||||||
|
"size": [0.565, 0.6, 0.565],
|
||||||
|
"pivot": [-2.5972, 4.52663, -12.59891],
|
||||||
|
"rotation": [0, 0, -45],
|
||||||
|
"uv": {
|
||||||
|
"north": {"uv": [45, 71], "uv_size": [0.5, 0.5]},
|
||||||
|
"east": {"uv": [71, 45], "uv_size": [0.5, 0.5]},
|
||||||
|
"south": {"uv": [46, 71], "uv_size": [0.5, 0.5]},
|
||||||
|
"west": {"uv": [71, 46], "uv_size": [0.5, 0.5]}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"origin": [-2.83072, 4.11063, -12.88141],
|
||||||
|
"size": [0.565, 0.5, 0.565],
|
||||||
|
"pivot": [-2.54822, 4.48563, -12.59891],
|
||||||
|
"rotation": [0, 0, -90],
|
||||||
|
"uv": {
|
||||||
|
"north": {"uv": [41, 71], "uv_size": [0.5, 0.5]},
|
||||||
|
"east": {"uv": [42, 71], "uv_size": [0.5, 0.5]},
|
||||||
|
"south": {"uv": [43, 71], "uv_size": [0.5, 0.5]},
|
||||||
|
"west": {"uv": [44, 71], "uv_size": [0.5, 0.5]}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "body",
|
"name": "body",
|
||||||
"parent": "0",
|
"parent": "0",
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -10,8 +10,8 @@
|
||||||
"Magazine": 3,
|
"Magazine": 3,
|
||||||
"BoltActionTime": 37,
|
"BoltActionTime": 37,
|
||||||
"Weight": 13,
|
"Weight": 13,
|
||||||
"NormalReloadTime": 63,
|
"NormalReloadTime": 84,
|
||||||
"EmptyReloadTime": 92,
|
"EmptyReloadTime": 112,
|
||||||
"BypassesArmor": 1,
|
"BypassesArmor": 1,
|
||||||
"SoundRadius": 22
|
"SoundRadius": 22
|
||||||
}
|
}
|
||||||
Loading…
Add table
Reference in a new issue